X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=blobdiff_plain;f=pazpar2.spec;h=7a6dc29ec04a4f26f4a6875261be5620deb71641;hp=c038139531f66c503356ab981a3306f827e1dda1;hb=c61904671e969a32a7f9d38a523f7abaa2b371fd;hpb=98c9356102a338238afc5b85af52acc4c8a2267c

diff --git a/pazpar2.spec b/pazpar2.spec
index c038139..7a6dc29 100644
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -1,17 +1,18 @@
-Summary: Metasearcher
+%define idmetaversion %(. ./IDMETA; echo $VERSION)
 Name: pazpar2
-Version: 1.6.2
-Release: 1indexdata
+Version: %{idmetaversion}
+Release: 1.indexdata
 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 >= 4.2.0
+BuildRequires: libyaz5-devel >= 5.12.0
 Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/pazpar2
 Summary: pazpar2 daemon
-Requires: libyaz4
+Requires: libyaz5 >= 5.12.0
+Requires: pazpar2-xsl
 
 %description
 Pazpar2 is a high-performance, user interface-independent, data
@@ -24,6 +25,14 @@ Group: Data
 Requires: pazpar2
 
 %post
+for f in /usr/share/pazpar2/xsl/*.xsl; do
+	e=/etc/pazpar2/`basename $f`
+	if test -f $e; then
+		if diff $e $f >/dev/null; then
+			rm $e
+		fi
+	fi
+done
 if [ $1 = 1 ]; then
 	/sbin/chkconfig --add pazpar2
 	/sbin/service pazpar2 start > /dev/null 2>&1
@@ -51,6 +60,14 @@ if [ $1 = 0 ]; then
 		rm /etc/httpd/conf.d/pazpar2-js.conf
 	fi
 fi
+%package -n pazpar2-xsl
+Summary: XSLTs for converting to pz2 format
+Group: Data
+
+%description -n pazpar2-xsl
+This package includes XSLTs for converting from various input XML formats
+to Pazpar2's internal XML format.
+
 %package -n pazpar2-doc
 Summary: pazpar2 documentation
 Group: Data
@@ -70,8 +87,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
@@ -80,7 +96,9 @@ 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 etc/*.xsl ${RPM_BUILD_ROOT}/etc/pazpar2/
+cp -r etc/settings/mkc ${RPM_BUILD_ROOT}/etc/pazpar2/settings
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/pazpar2/xsl
+cp etc/xsl/*.xsl ${RPM_BUILD_ROOT}/usr/share/pazpar2/xsl
 mkdir -p ${RPM_BUILD_ROOT}/etc/rc.d/init.d
 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
@@ -96,11 +114,12 @@ 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
@@ -113,6 +132,10 @@ rm -fr ${RPM_BUILD_ROOT}
 %{_datadir}/pazpar2/js/pz2.js
 %config %{_sysconfdir}/pazpar2/ap2pazpar2-js.cfg
 
+%files -n pazpar2-xsl
+%defattr(-,root,root)
+%{_datadir}/pazpar2/xsl
+
 %files -n pazpar2-doc
 %defattr(-,root,root)
 %{_defaultdocdir}/pazpar2