SPECS: man.spec - use %service; rel 6

glen glen at pld-linux.org
Fri May 19 23:26:22 CEST 2006


Author: glen                         Date: Fri May 19 21:26:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service; rel 6

---- Files affected:
SPECS:
   man.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: SPECS/man.spec
diff -u SPECS/man.spec:1.121 SPECS/man.spec:1.122
--- SPECS/man.spec:1.121	Fri May 12 22:33:27 2006
+++ SPECS/man.spec	Fri May 19 23:26:16 2006
@@ -11,7 +11,7 @@
 Summary(uk):	îÁÂŚŇ ŐÔÉĚŚÔ ÄĚŃ ÄĎËŐÍĹÎÔÁĂŚ§: man, apropos ÔÁ whatis
 Name:		man
 Version:	1.6c
-Release:	5
+Release:	6
 License:	GPL
 Group:		Applications/System
 Source0:	http://primates.ximian.com/~flucifredi/man/%{name}-%{version}.tar.gz
@@ -40,7 +40,7 @@
 Patch17:    %{name}-encoding.patch
 URL:		http://primates.ximian.com/~flucifredi/man/
 BuildRequires:	less
-BuildRequires:	rpmbuild(macros) >= 1.276
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	fileutils
 Requires:	%{name}-config = %{version}-%{release}
@@ -342,18 +342,13 @@
 if [ -L /etc/apache/conf.d/09_man.conf ]; then
 	rm -f /etc/apache/conf.d/09_man.conf
 	/usr/sbin/webapp register apache %{_webapp}
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service -q apache reload
 fi
 if [ -L /etc/httpd/httpd.conf/09_man.conf ]; then
 	rm -f /etc/httpd/httpd.conf/09_man.conf
 	/usr/sbin/webapp register httpd %{_webapp}
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service -q httpd reload
 fi
-exit 0
 
 %files -f man.lang
 %defattr(644,root,root,755)
@@ -492,6 +487,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2006/05/19 21:26:16  glen
+- use %service; rel 6
+
 Revision 1.121  2006/05/12 20:33:27  witekfl
 - added encoding.patch
 - rel 5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/man.spec?r1=1.121&r2=1.122&f=u



More information about the pld-cvs-commit mailing list