X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=metaproxy.spec;h=80e42a3ce9edb83eb7ca29383dc01167cd5d7403;hb=f51a51c6c6e1f8c5de6e90f548df3d8dc12e00ac;hp=62e075a08d59c7fac3555c202ab3b78be926ed2d;hpb=8e494be7d760b4fe8f5b0d9e48a19b2dca7d962b;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index 62e075a..80e42a3 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.59, libyazpp5-devel >= 1.4.1
 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/*
@@ -91,6 +91,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_bindir}/metaproxy-config
+%{_mandir}/man1/metaproxy-config.*
 
 %files doc
 %defattr(-,root,root)
@@ -99,7 +100,8 @@ 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