X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=metaproxy.spec;h=677e0608c19180e0dd4b4deda12a76b7cb92ae26;hb=41bb035dfc40b470d8efbc27dcda5ac3f754df0e;hp=f516c3a29246aa28141182ace1b9dda482bc0219;hpb=896157cb0f215b54125773b8a98c257c1724239e;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index f516c3a..677e060 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -9,8 +9,9 @@ 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.27, libyazpp4-devel >= 1.2.7
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.50, libyazpp5-devel >= 1.4.0
 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
@@ -29,7 +30,7 @@ Metaproxy documentation.
 %package -n libmetaproxy4
 Summary: Metaproxy library
 Group: Libraries
-Requires: libyazpp4, libyaz4 >= 4.2.22
+Requires: libyazpp5 >= 1.4.0, libyaz4 >= 4.2.50
 
 %description -n libmetaproxy4
 The Metaproxy libraries.
@@ -37,7 +38,7 @@ The Metaproxy libraries.
 %package -n libmetaproxy4-devel
 Summary: Metaproxy development package
 Group: Development/Libraries
-Requires: libmetaproxy4 = %{version}, libyazpp4-devel, boost-devel
+Requires: libmetaproxy4 = %{version}, libyazpp5-devel, boost-devel
 Conflicts: libmetaproxy3-devel
 
 %description -n libmetaproxy4-devel
@@ -55,8 +56,7 @@ make CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 rm -fr ${RPM_BUILD_ROOT}
-make prefix=${RPM_BUILD_ROOT}/%{_prefix} mandir=${RPM_BUILD_ROOT}/%{_mandir} \
-	libdir=${RPM_BUILD_ROOT}/%{_libdir} install
+make install DESTDIR=${RPM_BUILD_ROOT}
 rm ${RPM_BUILD_ROOT}/%{_libdir}/*.la
 rm -fr ${RPM_BUILD_ROOT}/%{_prefix}/share/metaproxy
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy/*
@@ -67,6 +67,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
@@ -90,6 +91,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_bindir}/metaproxy-config
+%{_mandir}/man1/metaproxy-config.*
 
 %files doc
 %defattr(-,root,root)
@@ -98,20 +100,18 @@ rm -fr ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root)
 %{_bindir}/metaproxy
-%{_mandir}/man?/*
+%{_mandir}/man3/*
+%{_mandir}/man1/metaproxy.*
 %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 +149,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