X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=metaproxy.spec;h=94d9bf0d13b20cf46392b44ac22b2a1f9316a9d8;hb=d0e7f69b5a478e2a3b3b83b3f9df6dded96c4804;hp=eaf8f5ce247cc9c8e6ed42ecbd5bb5d9c1e9721b;hpb=d908bd814ae464d896adf1b280b897bfaac290bb;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index eaf8f5c..94d9bf0 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -1,6 +1,7 @@
+%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
 Summary: Z39.50/SRU router
 Name: metaproxy
-Version: 1.3.0
+Version: %{idmetaversion}
 Release: 1indexdata
 License: GPL
 Group: Applications/Internet
@@ -8,12 +9,13 @@ Vendor: Index Data ApS <info@indexdata.dk>
 Source: metaproxy-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Prefix: %{_prefix} /etc/metaproxy
-BuildRequires: pkgconfig, libyaz4-devel >= 4.2.3, libyazpp4-devel >= 1.2.6
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.32, 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
-# Requires: 
+Requires:  libmetaproxy4 = %{version}
 
 %description
 Metaproxy daemon.
@@ -28,7 +30,7 @@ Metaproxy documentation.
 %package -n libmetaproxy4
 Summary: Metaproxy library
 Group: Libraries
-Requires: libyazpp4
+Requires: libyazpp4, libyaz4 >= 4.2.22
 
 %description -n libmetaproxy4
 The Metaproxy libraries.
@@ -59,13 +61,14 @@ make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
 rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 rm -fr ${RPM_BUILD_ROOT}/%{_prefix}/share/metaproxy
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/*
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/modules
+mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy4/modules
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-enabled
 mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/filters-available
 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
@@ -77,7 +80,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %doc README LICENSE NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%dir %{_libdir}/metaproxy/modules
+%dir %{_libdir}/metaproxy4/modules
 
 %post -n libmetaproxy4 -p /sbin/ldconfig
 
@@ -100,12 +103,39 @@ 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
+. /etc/metaproxy/metaproxy.user
+
+ # 1. create group if not existing
+if ! getent group | grep -q "^$SERVER_GROUP:" ; then
+        echo -n "Adding group $SERVER_GROUP.."
+        groupadd -r $SERVER_GROUP 2>/dev/null ||true
+        echo "..done"
+fi
+# 2. create user if not existing
+if ! getent passwd | grep -q "^$SERVER_USER:"; then
+        echo -n "Adding system user $SERVER_USER.."
+        useradd \
+            -r \
+	    -s /sbin/nologin \
+            -c "$SERVER_NAME" \
+	    -d $SERVER_HOME \
+            -g $SERVER_GROUP \
+            $SERVER_USER 2>/dev/null || true
+        echo "..done"
+fi
+
+if test ! -d $SERVER_HOME; then
+	mkdir $SERVER_HOME
+	chown $SERVER_USER:$SERVER_GROUP $SERVER_HOME
+fi
+
 if [ $1 = 1 ]; then
         /sbin/chkconfig --add metaproxy
         /sbin/service metaproxy start > /dev/null 2>&1
@@ -114,7 +144,11 @@ else
 fi
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service metaproxy stop > /dev/null 2>&1
-        /sbin/chkconfig --del metaproxy
+	if test -f /etc/init.d/metaproxy; then
+        	/sbin/service metaproxy stop > /dev/null 2>&1
+        	/sbin/chkconfig --del metaproxy
+	fi
+	. /etc/metaproxy/metaproxy.user
+	test -d $SERVER_HOME && rm -fr $SERVER_HOME
+	userdel $SERVER_USER
 fi
-