X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=metaproxy.spec;h=5dff7a96d9d9d267cf00d2aba40b0a0800399910;hb=558ce9ed69e55b2193475156b142c60d171db5ff;hp=7ef55d1069c9438284f05183c9d2af92583056cd;hpb=2008e3653a97ae57cfa25ecbb92e6e1d3c01b568;p=metaproxy-moved-to-github.git

diff --git a/metaproxy.spec b/metaproxy.spec
index 7ef55d1..5dff7a9 100644
--- a/metaproxy.spec
+++ b/metaproxy.spec
@@ -9,7 +9,7 @@ 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.33, libyazpp4-devel >= 1.3.2
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.69, libyazpp5-devel >= 1.4.1
 BuildRequires: libxslt-devel, boost-devel
 Conflicts: cf-engine <= 2.12.5
 Packager: Adam Dickmeiss <adam@indexdata.dk>
@@ -30,7 +30,7 @@ Metaproxy documentation.
 %package -n libmetaproxy4
 Summary: Metaproxy library
 Group: Libraries
-Requires: libyazpp4 >= 1.3.2, libyaz4 >= 4.2.33
+Requires: libyazpp5 >= 1.4.0, libyaz4 >= 4.2.69
 
 %description -n libmetaproxy4
 The Metaproxy libraries.
@@ -38,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
@@ -56,14 +56,15 @@ 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}/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
@@ -108,6 +109,8 @@ rm -fr ${RPM_BUILD_ROOT}
 %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