From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 24 Apr 2014 11:34:54 +0000 (+0200)
Subject: Separate package: pazpar2-xsl
X-Git-Tag: v1.7.0~19^2~1
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=812d2ddabcbacea19adaffb1bfa61e8a35c08f3e;p=pazpar2-moved-to-github.git

Separate package: pazpar2-xsl
---

diff --git a/debian/control b/debian/control
index e4a4199..96daf36 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Standards-Version: 3.7.2
 
 Package: pazpar2
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, pazpar2-xsl
 Description: High-performance metaseacher
  Pazpar2 is a high-performance, user interface-independent, data
  model-independent metasearching middleware featuring merging, relevance
@@ -44,6 +44,16 @@ Description: Java Script utilities
  Alias for Apache2 so that this library and other demo portals are
  available.
 
+Package: pazpar2-xsl
+Architecture: all
+Description: XSLTs for converting to pz2 XML
+ Pazpar2 is a high-performance, user interface-independent, data
+ model-independent metasearching middleware featuring merging, relevance
+ ranking, record sorting, and faceted results.
+ .
+ This package includes the standard XSLTs for converting various external
+ XML Formats to pazpar2's internal format (pz2).
+
 Package: pazpar2-doc
 Section: doc
 Architecture: all
diff --git a/debian/pazpar2-xsl.dirs b/debian/pazpar2-xsl.dirs
new file mode 100644
index 0000000..8973862
--- /dev/null
+++ b/debian/pazpar2-xsl.dirs
@@ -0,0 +1 @@
+usr/share/pazpar2/xsl
diff --git a/debian/rules b/debian/rules
index 1baae7e..994e621 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,6 @@ override_dh_auto_install:
 	cp etc/services/*.xml debian/pazpar2/etc/pazpar2/services-available
 	cp etc/settings/*.xml debian/pazpar2/etc/pazpar2/settings/
 	cp -r etc/settings/mkc debian/pazpar2/etc/pazpar2/settings
-	cp -r etc/xsl debian/pazpar2/etc/pazpar2
 # pazpar2-apache2 package
 	cp debian/ap2pazpar2.cfg debian/pazpar2-apache2/etc/pazpar2
 # pazpar2-test1 package
@@ -38,6 +37,8 @@ override_dh_auto_install:
 # pazpar2-js package
 	cp debian/ap2pazpar2-js.cfg debian/pazpar2-js/etc/pazpar2
 	mv debian/tmp/usr/share/pazpar2/js/pz2.js debian/pazpar2-js/usr/share/pazpar2/js/
+# pazpar2-xsl package
+	cp -r etc/xsl debian/pazpar2-xsl/usr/share/pazpar2
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
diff --git a/etc/server.xml b/etc/server.xml
index a808a7a..54b170b 100644
--- a/etc/server.xml
+++ b/etc/server.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pazpar2 xmlns="http://www.indexdata.com/pazpar2/1.0">
   <threads number="0"/> <!-- non-zero to enable threaded operation -->
-  <file path=".:xsl"/> 
+  <file path=".:/usr/share/pazpar2/xsl"/> 
   <server>
     <listen port="8004"/>
 
diff --git a/pazpar2.spec b/pazpar2.spec
index 7dc5f07..3b91541 100644
--- a/pazpar2.spec
+++ b/pazpar2.spec
@@ -13,6 +13,7 @@ Packager: Adam Dickmeiss <adam@indexdata.dk>
 URL: http://www.indexdata.com/pazpar2
 Summary: pazpar2 daemon
 Requires: libyaz5 >= 5.0.0
+Requires: pazpar2-xsl
 
 %description
 Pazpar2 is a high-performance, user interface-independent, data
@@ -52,6 +53,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
@@ -81,7 +90,8 @@ 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 -r etc/xsl ${RPM_BUILD_ROOT}/etc/pazpar2
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/pazpar2
+cp -r etc/xsl ${RPM_BUILD_ROOT}/usr/share/pazpar2
 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
@@ -101,7 +111,6 @@ rm -fr ${RPM_BUILD_ROOT}
 %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
@@ -116,6 +125,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