X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pazpar2.spec.in;h=b7f35a3f90f8adc1b1732158df7c6285e0fce195;hb=e9d5a07ea9643dbeb64316fc0186906616b00c0f;hp=b064130423469acdebcb12ad4148959edd647813;hpb=ed49503d275b063f18acd3cfd40cf129748830bb;p=pazpar2-moved-to-github.git

diff --git a/pazpar2.spec.in b/pazpar2.spec.in
index b064130..b7f35a3 100644
--- a/pazpar2.spec.in
+++ b/pazpar2.spec.in
@@ -25,9 +25,12 @@ Group: Data
 Requires: pazpar2
 
 %post
-/sbin/chkconfig --add pazpar2
-/sbin/service pazpar2 start > /dev/null 2>&1
-
+if [ $1 = 1 ]; then
+	/sbin/chkconfig --add pazpar2
+	/sbin/service pazpar2 start > /dev/null 2>&1
+else
+	/sbin/service pazpar2 restart > /dev/null 2>&1
+fi
 %preun
 if [ $1 = 0 ]; then
 	/sbin/service pazpar2 stop > /dev/null 2>&1
@@ -39,15 +42,15 @@ This package includes the Java Script library pz2.js. It also adds an
 Alias for Apache2 so that this library and other demo portals are
 available.
 
-%post -n pazpar2-js
+%posttrans -n pazpar2-js
 if [ -d /etc/httpd/conf.d ]; then
 	ln -sf /etc/pazpar2/ap2pazpar2-js.cfg /etc/httpd/conf.d/pazpar2-js.conf
-	/sbin/service httpd condrestart
 fi
 %preun -n pazpar2-js
-if [ -L /etc/httpd/conf.d/pazpar2-js.conf ]; then
-	rm /etc/httpd/conf.d/pazpar2-js.conf
-	/sbin/service httpd condrestart
+if [ $1 = 0 ]; then
+	if [ -L /etc/httpd/conf.d/pazpar2-js.conf ]; then
+		rm /etc/httpd/conf.d/pazpar2-js.conf
+	fi
 fi
 %package -n pazpar2-doc
 Summary: pazpar2 documentation
@@ -82,6 +85,9 @@ 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
 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
+
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
@@ -98,6 +104,7 @@ rm -fr ${RPM_BUILD_ROOT}
 %config %{_sysconfdir}/pazpar2/settings/*.xml
 %config %{_sysconfdir}/pazpar2/services-available/*.xml
 %config %{_sysconfdir}/rc.d/init.d/pazpar2
+%config(noreplace) /etc/logrotate.d/pazpar2
 %{_mandir}/man5/pazpar2*
 %{_mandir}/man7/pazpar2*
 %{_mandir}/man8/pazpar2*