X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pazpar2.spec;h=813d457dffe16efd0f0090a0f30e645c4f5c92a8;hb=16c571a7e5b4e9b96a729a5b4aee373f7347375c;hp=87dfc9401589eff356a40dba01d603785c47ef64;hpb=3592f87a905df726b2d30a4536bd6d3bd22a7df0;p=pazpar2-moved-to-github.git

diff --git a/pazpar2.spec b/pazpar2.spec
index 87dfc94..813d457 100644
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -1,24 +1,24 @@
+%define idmetaversion %(. ./IDMETA; echo $VERSION|tr -d '\n')
 Summary: Metasearcher
 Name: pazpar2
-Version: 1.5.0
-Release: 1
+Version: %{idmetaversion}
+Release: 1indexdata
 License: GPL
 Group: Applications/Internet
 Vendor: Index Data ApS <info@indexdata.dk>
 Source: pazpar2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libyaz4-devel
+BuildRequires: libyaz4-devel >= 4.2.63
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/pazpar2
+Summary: pazpar2 daemon
+Requires: libyaz4 >= 4.2.63
 
 %description
 Pazpar2 is a high-performance, user interface-independent, data
 model-independent metasearching middleware featuring merging, relevance
 ranking, record sorting, and faceted results.
 
-Summary: pazpar2 daemon
-Requires: libyaz4
-
 %package -n pazpar2-js
 Summary: pazpar2 JS
 Group: Data
@@ -71,8 +71,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}
 mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2
 mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/settings
 mkdir -p ${RPM_BUILD_ROOT}/etc/pazpar2/services-enabled
@@ -81,12 +80,13 @@ cp etc/server.xml ${RPM_BUILD_ROOT}/etc/pazpar2/
 cp etc/default.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/
 cp etc/services/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/services-available/
 cp etc/settings/*.xml ${RPM_BUILD_ROOT}/etc/pazpar2/settings/
+cp -r etc/settings/mkc ${RPM_BUILD_ROOT}/etc/pazpar2/settings
 cp etc/*.xsl ${RPM_BUILD_ROOT}/etc/pazpar2/
 mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d
-install -m755 src/pazpar2.rpm.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2
+install -m755 rpm/pazpar2.init ${RPM_BUILD_ROOT}/etc/rc.d/init.d/pazpar2
 echo "Alias /pazpar2 /usr/share/pazpar2" >${RPM_BUILD_ROOT}/etc/pazpar2/ap2pazpar2-js.cfg
 mkdir -p ${RPM_BUILD_ROOT}/etc/logrotate.d
-install -m644 src/pazpar2.rpm.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/pazpar2
+install -m644 rpm/pazpar2.logrotate ${RPM_BUILD_ROOT}/etc/logrotate.d/pazpar2
 
 %clean
 rm -fr ${RPM_BUILD_ROOT}
@@ -97,11 +97,13 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_sbindir}/pazpar2
 %dir %{_sysconfdir}/pazpar2
 %dir %{_sysconfdir}/pazpar2/settings
+%dir %{_sysconfdir}/pazpar2/settings/mkc
 %dir %{_sysconfdir}/pazpar2/services-enabled
 %dir %{_sysconfdir}/pazpar2/services-available
 %config %{_sysconfdir}/pazpar2/*.xml
 %config %{_sysconfdir}/pazpar2/*.xsl
 %config %{_sysconfdir}/pazpar2/settings/*.xml
+%config %{_sysconfdir}/pazpar2/settings/*/*.xml
 %config %{_sysconfdir}/pazpar2/services-available/*.xml
 %config %{_sysconfdir}/rc.d/init.d/pazpar2
 %config(noreplace) /etc/logrotate.d/pazpar2