X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=metaproxy.spec;h=6e5a25255b6ccbbc47e98b4ee0f631543b457896;hb=3552169fcc031ee61f606d8b1b7bf1503085d47b;hp=f516c3a29246aa28141182ace1b9dda482bc0219;hpb=896157cb0f215b54125773b8a98c257c1724239e;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index f516c3a..6e5a252 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy
 BuildRequires: pkgconfig, libyaz4-devel >= 4.2.27, libyazpp4-devel >= 1.2.7
 BuildRequires: libxslt-devel, boost-devel
+Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/metaproxy
 Group:  Applications/Internet
@@ -67,6 +68,7 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
 mkdir -p ${RPM_BUILD_ROOT}/etc/sysconfig
 install -m 644 rpm/metaproxy.xml ${RPM_BUILD_ROOT}/etc/metaproxy/metaproxy.xml
+install -m 644 rpm/metaproxy.user ${RPM_BUILD_ROOT}/etc/metaproxy/metaproxy.user
 install -m 755 rpm/metaproxy.init ${RPM_BUILD_ROOT}/etc/init.d/metaproxy
 install -m 644 rpm/metaproxy.sysconfig ${RPM_BUILD_ROOT}/etc/sysconfig/metaproxy
 install -m 644 rpm/metaproxy.logrotate  ${RPM_BUILD_ROOT}/etc/logrotate.d/metaproxy
@@ -101,17 +103,14 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_mandir}/man?/*
 %config /etc/init.d/metaproxy
 %config(noreplace) /etc/metaproxy/metaproxy.xml
+%config /etc/metaproxy/metaproxy.user
 %dir /etc/metaproxy/filters-available
 %dir /etc/metaproxy/filters-enabled
 %config(noreplace) /etc/logrotate.d/metaproxy
 %config(noreplace) /etc/sysconfig/metaproxy
 
 %post
-[ -f /etc/sysconfig/metaproxy ] && . /etc/sysconfig/metaproxy
-[ -z "$SERVER_HOME" ] && SERVER_HOME=/var/metaproxy
-[ -z "$SERVER_USER" ] && SERVER_USER=metaproxy
-[ -z "$SERVER_NAME" ] && SERVER_NAME="Metaproxy user"
-[ -z "$SERVER_GROUP" ] && SERVER_GROUP=metaproxy
+. /etc/metaproxy/metaproxy.user
 
  # 1. create group if not existing
 if ! getent group | grep -q "^$SERVER_GROUP:" ; then
@@ -149,15 +148,7 @@ if [ $1 = 0 ]; then
         	/sbin/service metaproxy stop > /dev/null 2>&1
         	/sbin/chkconfig --del metaproxy
 	fi
-fi
-%postun
-[ -f /etc/sysconfig/metaproxy ] && . /etc/sysconfig/metaproxy
-[ -z "$SERVER_HOME" ] && SERVER_HOME=/var/metaproxy
-[ -z "$SERVER_USER" ] && SERVER_USER=metaproxy
-[ -z "$SERVER_NAME" ] && SERVER_NAME="Metaproxy user"
-[ -z "$SERVER_GROUP" ] && SERVER_GROUP=metaproxy
-
-if [ $1 = 0 ]; then
+	. /etc/metaproxy/metaproxy.user
 	test -d $SERVER_HOME && rm -fr $SERVER_HOME
 	userdel $SERVER_USER
 fi