X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=metaproxy.spec;h=2f973f96b0e35690c85227982e59297f01c8cb99;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=f516c3a29246aa28141182ace1b9dda482bc0219;hpb=896157cb0f215b54125773b8a98c257c1724239e;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index f516c3a..2f973f9 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -2,19 +2,21 @@
 Summary: Z39.50/SRU router
 Name: metaproxy
 Version: %{idmetaversion}
-Release: 1indexdata
+Release: 1.indexdata
 License: GPL
 Group: Applications/Internet
 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, libyaz5-devel >= 5.7.0, libyazpp6-devel >= 1.6.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
-Requires:  libmetaproxy4 = %{version}
+Requires:  libmetaproxy6 = %{version}
+Provides: metaproxy6
 
 %description
 Metaproxy daemon.
@@ -26,21 +28,21 @@ Group: Documentation
 %description doc
 Metaproxy documentation.
 
-%package -n libmetaproxy4
+%package -n libmetaproxy6
 Summary: Metaproxy library
 Group: Libraries
-Requires: libyazpp4, libyaz4 >= 4.2.22
+Requires: libyazpp6 >= 1.6.0, libyaz5 >= 5.7.0
 
-%description -n libmetaproxy4
+%description -n libmetaproxy6
 The Metaproxy libraries.
 
-%package -n libmetaproxy4-devel
+%package -n libmetaproxy6-devel
 Summary: Metaproxy development package
 Group: Development/Libraries
-Requires: libmetaproxy4 = %{version}, libyazpp4-devel, boost-devel
-Conflicts: libmetaproxy3-devel
+Requires: libmetaproxy6 = %{version}, libyazpp6-devel, boost-devel
+Conflicts: libmetaproxy3-devel, libmetaproxy4-devel, libmetaproxy5-devel
 
-%description -n libmetaproxy4-devel
+%description -n libmetaproxy6-devel
 Development libraries and include files for the Metaproxy package.
 
 %prep
@@ -55,18 +57,20 @@ 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/*
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy4/modules
+mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/metaproxy6/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/metaproxy/ports.d
+mkdir -p ${RPM_BUILD_ROOT}/etc/metaproxy/routes.d
 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
@@ -74,22 +78,23 @@ install -m 644 rpm/metaproxy.logrotate  ${RPM_BUILD_ROOT}/etc/logrotate.d/metapr
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
-%files -n libmetaproxy4
+%files -n libmetaproxy6
 %doc README LICENSE NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so.*
-%dir %{_libdir}/metaproxy4/modules
+%dir %{_libdir}/metaproxy6/modules
 
-%post -n libmetaproxy4 -p /sbin/ldconfig
+%post -n libmetaproxy6 -p /sbin/ldconfig
 
-%postun -n libmetaproxy4 -p /sbin/ldconfig
+%postun -n libmetaproxy6 -p /sbin/ldconfig
 
-%files -n libmetaproxy4-devel
+%files -n libmetaproxy6-devel
 %defattr(-,root,root)
 %{_includedir}/metaproxy
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_bindir}/metaproxy-config
+%{_mandir}/man1/metaproxy-config.*
 
 %files doc
 %defattr(-,root,root)
@@ -98,20 +103,20 @@ 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
+%dir /etc/metaproxy/ports.d
+%dir /etc/metaproxy/routes.d
 %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 +154,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