SPECS: pulsard.spec, pure-ftpd.spec, pwdutils.spec - use %service, ...

glen glen at pld-linux.org
Sun Mar 12 23:56:34 CET 2006 

Author: glen                         Date: Sun Mar 12 22:56:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service, adapterized

---- Files affected:
SPECS:
   pulsard.spec (1.17 -> 1.18) , pure-ftpd.spec (1.145 -> 1.146) , pwdutils.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: SPECS/pulsard.spec
diff -u SPECS/pulsard.spec:1.17 SPECS/pulsard.spec:1.18
--- SPECS/pulsard.spec:1.17	Tue Dec 13 15:37:24 2005
+++ SPECS/pulsard.spec	Sun Mar 12 23:56:28 2006
@@ -15,6 +15,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libgpio-devel >= 0.0.2
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -51,17 +52,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f %{_var}/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start pulsard ups daemon."
-fi
+%service %{name} restart "pulsard ups daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f %{_var}/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-	fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -79,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/03/12 22:56:28  glen
+- use %service, adapterized
+
 Revision 1.17  2005/12/13 14:37:24  glen
 - adapterized (sorted %verify flags)
 
@@ -101,18 +99,18 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.10  2002/12/07 14:33:45  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.9  2002/11/29 22:46:07  ankry
-- massive attack: new %%doc
+- massive attack: new %doc
 
 Revision 1.8  2002/10/09 13:14:45  kloczek
 - use more macros, some cosmetics, added missing "rm -f missing" and use new %doc
 
 Revision 1.7  2002/05/21 23:14:34  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.6  2002/03/24 23:28:23  kloczek
 - perl -pi -e "s/^automake -a -c$/automake -a -c -f/"
@@ -122,14 +120,14 @@
   Group field using gettext).
 
 Revision 1.4  2002/01/18 02:14:43  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.3  2001/09/25 12:31:36  qboosh
 - release 2: Prereq: /sbin/chkconfig
 
 Revision 1.2  2001/08/15 21:02:23  kloczek
 - fixed Source url,
-- removed using some %%{__*} macros.
+- removed using some %{__*} macros.
 
 Revision 1.1  2001/08/15 20:47:56  misiek
 - initial pld release; software for MGE UPSes

================================================================
Index: SPECS/pure-ftpd.spec
diff -u SPECS/pure-ftpd.spec:1.145 SPECS/pure-ftpd.spec:1.146
--- SPECS/pure-ftpd.spec:1.145	Tue Feb 21 13:00:31 2006
+++ SPECS/pure-ftpd.spec	Sun Mar 12 23:56:28 2006
@@ -42,15 +42,16 @@
 %{?with_tls:BuildRequires:	openssl-devel}
 BuildRequires:	pam-devel
 %{?with_pgsql:BuildRequires:	postgresql-devel}
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	pam >= 0.79.0
 %{!?with_extra:Requires:	perl-base}
 Requires:	rc-scripts
 Provides:	ftpserver
-Obsoletes:	ftpserver
 Obsoletes:	anonftp
 Obsoletes:	bftpd
 Obsoletes:	ftpd-BSD
+Obsoletes:	ftpserver
 Obsoletes:	glftpd
 Obsoletes:	heimdal-ftpd
 Obsoletes:	linux-ftpd
@@ -167,17 +168,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f %{_var}/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start PureFTPD daemon."
-fi
+%service %{name} restart "PureFTPD daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f %{_var}/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop 1>&2
-	fi
+	%service %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -209,6 +204,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2006/03/12 22:56:28  glen
+- use %service, adapterized
+
 Revision 1.145  2006/02/21 12:00:31  arekm
 - up to 1.0.21
 

================================================================
Index: SPECS/pwdutils.spec
diff -u SPECS/pwdutils.spec:1.71 SPECS/pwdutils.spec:1.72
--- SPECS/pwdutils.spec:1.71	Sat Feb 18 11:39:24 2006
+++ SPECS/pwdutils.spec	Sun Mar 12 23:56:28 2006
@@ -41,9 +41,10 @@
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
-%{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7d}
 BuildRequires:	openslp-devel
+%{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7d}
 BuildRequires:	pam-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Provides:	shadow = 2:%{version}-%{release}
 Provides:	shadow-extras = 2:%{version}-%{release}
@@ -112,8 +113,8 @@
 Summary:	Remote password update daemon
 Summary(pl):	Demon do zdalnego uaktualniania haseł
 Group:		Applications/System
-Requires:	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 
 %description -n rpasswdd
 rpasswdd is a daemon that lets users change their passwords in the
@@ -211,17 +212,11 @@
 
 %post -n rpasswdd
 /sbin/chkconfig --add rpasswdd
-if [ -f /var/lock/subsys/rpasswdd ]; then
-	/etc/rc.d/init.d/rpasswdd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/rpasswdd start\" to start rpasswdd daemon."
-fi
+%service rpasswdd restart "rpasswdd daemon"
 
 %preun -n rpasswdd
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/rpasswdd ]; then
-		/etc/rc.d/init.d/rpasswdd stop 1>&2
-	fi
+	%service rpasswdd stop
 	/sbin/chkconfig --del rpasswdd
 fi
 
@@ -306,6 +301,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2006/03/12 22:56:28  glen
+- use %service, adapterized
+
 Revision 1.71  2006/02/18 10:39:24  qboosh
 - typos
 
@@ -313,7 +311,7 @@
 - release 2
 - fixed %files
 - added rpasswd package so pam_rpasswd does not depend on pwdutils
-	(because passwd from pwdutils sucks contrary to passwd from shadow)
+  (because passwd from pwdutils sucks contrary to passwd from shadow)
 
 Revision 1.69  2006/02/05 22:02:43  qboosh
 - updated to 3.0.7, updated pl.po-update patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pulsard.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/SPECS/pure-ftpd.spec?r1=1.145&r2=1.146&f=u
    http://cvs.pld-linux.org/SPECS/pwdutils.spec?r1=1.71&r2=1.72&f=u

More information about the pld-cvs-commit mailing list