Careful check of </script> termination

[metaproxy-moved-to-github.git] / metaproxy.spec

diff --git a/metaproxy.spec b/metaproxy.spec
index e269736..f3afed4 100644 (file)
--- 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.50, libyazpp5-devel >= 1.4.0
+BuildRequires: pkgconfig, libyaz4-devel >= 4.2.62, 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: libyazpp5 >= 1.4.0, libyaz4 >= 4.2.50
+Requires: libyazpp5 >= 1.4.0, libyaz4 >= 4.2.62
 
 %description -n libmetaproxy4
 The Metaproxy libraries.
@@ -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