SPECS: plptools.spec - use %service (weird upgrade procedure removed)

glen glen at pld-linux.org
Sun Mar 12 19:20:17 CET 2006


Author: glen                         Date: Sun Mar 12 18:20:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service (weird upgrade procedure removed)

---- Files affected:
SPECS:
   plptools.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/plptools.spec
diff -u SPECS/plptools.spec:1.31 SPECS/plptools.spec:1.32
--- SPECS/plptools.spec:1.31	Tue Dec 13 15:37:24 2005
+++ SPECS/plptools.spec	Sun Mar 12 19:20:12 2006
@@ -5,7 +5,6 @@
 Version:	0.14
 Release:	1
 License:	GPL
-Vendor:		The plptools project
 Group:		Networking/Utilities
 Source0:	http://dl.sourceforge.net/plptools/%{name}-%{version}.tar.gz
 # Source0-md5:	728902c3bfc44de175cb59256f3283a5
@@ -29,7 +28,7 @@
 BuildRequires:	perl-base
 BuildRequires:	python
 BuildRequires:	readline-devel
-BuildRequires:	rpmbuild(macros) >= 1.129
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 BuildRequires:	unsermake >= 040805
 Requires(post):	/sbin/ldconfig
@@ -299,19 +298,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-if [ "$1" != "0" -a -f /var/lock/subsys/psion ]; then
-	/etc/rc.d/init.d/psion stop >&2
-	touch /var/lock/subsys/psion_was_started
-fi
-
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add psion
-if [ -f /var/lock/subsys/psion_was_started ]; then
-	/etc/rc.d/init.d/psion start >&2
-fi
-rm -f /var/lock/subsys/psion_was_started
+%service psion restart
 
 %triggerin kde -- kdebase, kde-i18n-German
 perl %{_datadir}/%{name}/kiodoc-update.pl -a psion
@@ -321,7 +311,7 @@
 
 %preun
 if [ "$1" = "0" ]; then
-	/etc/rc.d/init.d/psion stop >&2
+	%service psion stop
 	/sbin/chkconfig --del psion
 fi
 
@@ -423,6 +413,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/03/12 18:20:12  glen
+- use %service (weird upgrade procedure removed)
+
 Revision 1.31  2005/12/13 14:37:24  glen
 - adapterized (sorted %verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/plptools.spec?r1=1.31&r2=1.32&f=u



More information about the pld-cvs-commit mailing list