SPECS: DenyHosts.spec, Firebird.spec, FreeWnn.spec, GNUnet.spec, N...

glen glen at pld-linux.org
Sun Mar 19 18:51:02 CET 2006


Author: glen                         Date: Sun Mar 19 17:51:02 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   DenyHosts.spec (1.16 -> 1.17) , Firebird.spec (1.31 -> 1.32) , FreeWnn.spec (1.20 -> 1.21) , GNUnet.spec (1.21 -> 1.22) , NetworkManager.spec (1.8 -> 1.9) , OpenPBS.spec (1.7 -> 1.8) , PowerChutePlus.spec (1.23 -> 1.24) , STonX.spec (1.13 -> 1.14) , TiMidity++.spec (1.80 -> 1.81) , VMware-server.spec (1.1 -> 1.2) , VMware-workstation.spec (1.83 -> 1.84) , WebChess.spec (1.7 -> 1.8) , XFree86.spec (1.617 -> 1.618) 

---- Diffs:

================================================================
Index: SPECS/DenyHosts.spec
diff -u SPECS/DenyHosts.spec:1.16 SPECS/DenyHosts.spec:1.17
--- SPECS/DenyHosts.spec:1.16	Tue Mar 14 18:29:28 2006
+++ SPECS/DenyHosts.spec	Sun Mar 19 18:50:57 2006
@@ -15,6 +15,7 @@
 BuildRequires:	python-devel
 BuildRequires:	python-modules
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -65,17 +66,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -r /var/lock/subsys/DenyHosts ]; then
-	/etc/rc.d/init.d/DenyHosts restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/DenyHosts start\" to start DenyHosts."
-fi
+%service DenyHosts restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/DenyHosts ]; then
-		/etc/rc.d/init.d/DenyHosts stop >&2
-	fi
+	%service DenyHosts stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -98,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/03/19 17:50:57  glen
+- use %service
+
 Revision 1.16  2006/03/14 17:29:28  rotom
 - up to 2.2
 

================================================================
Index: SPECS/Firebird.spec
diff -u SPECS/Firebird.spec:1.31 SPECS/Firebird.spec:1.32
--- SPECS/Firebird.spec:1.31	Tue Jan 31 22:04:55 2006
+++ SPECS/Firebird.spec	Sun Mar 19 18:50:57 2006
@@ -5,8 +5,8 @@
 #   (see firebird2 on debian how to do it)
 %bcond_with	ss	# Super Server
 Summary:	Firebird SQL Database Server and Client tools
-Summary(pl):	Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Summary(de):	Firebird - relationalen Open-Source- Datenbankmanagementsystems
+Summary(pl):	Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:		Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?
 Version:	1.5.3.4870
@@ -33,10 +33,10 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
-BuildRequires:	libtool
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
 BuildRequires:	ncurses-devel
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	unzip
 Requires:	%{name}-lib = %{version}-%{release}
 # official ports are x86, sparc and x86_64
@@ -204,17 +204,11 @@
 %if %{with ss}
 %post
 /sbin/chkconfig --add firebird
-if [ -f /var/lock/subsys/firebird ]; then
-	/etc/rc.d/init.d/firebird restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/firebird start\" to start firebird." >&2
-fi
+%service firebird restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/firebird ]; then
-		/etc/rc.d/init.d/firebird stop
-	fi
+	%service firebird stop
 	/sbin/chkconfig --del firebird
 fi
 %endif
@@ -284,6 +278,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2006/03/19 17:50:57  glen
+- use %service
+
 Revision 1.31  2006/01/31 21:04:55  qboosh
 - updated to 1.5.3.4870, removed obsolete env-overflows patch
 

================================================================
Index: SPECS/FreeWnn.spec
diff -u SPECS/FreeWnn.spec:1.20 SPECS/FreeWnn.spec:1.21
--- SPECS/FreeWnn.spec:1.20	Mon Dec 12 17:24:19 2005
+++ SPECS/FreeWnn.spec	Sun Mar 19 18:50:57 2006
@@ -1,14 +1,14 @@
 # $Revision$, $Date$
+%define upver	1.1.1
+%define alpha	018
 Summary:	FreeWnn Japanese Input System
 Summary(pl):	FreeWnn - system wprowadzania znaków japońskich
 Name:		FreeWnn
-%define upver	1.1.1
-%define alpha	018
 Version:	%{upver}a%{alpha}
 Release:	1
 Epoch:		1
-Group:		Applications/System
 License:	GPL
+Group:		Applications/System
 Source0:	ftp://ftp.freewnn.org/pub/FreeWnn/alpha/%{name}-%{upver}-a%{alpha}.tar.bz2
 # Source0-md5:	e4a56cd7373736c090c6b93a255b950b
 Source1:	%{name}.init
@@ -27,9 +27,9 @@
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
-BuildRequires:	rpmbuild(macros) >= 1.202
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	setup >= 2.4.1
 Conflicts:	wnn6
@@ -114,9 +114,9 @@
 Summary:	cWnn Chinese Input System (version for China)
 Summary(pl):	cWnn System wprowadzania znaków chińskich (wersja dla Chin)
 Group:		Applications/System
+Requires(post,preun):	/sbin/chkconfig
 Requires:	cWnn-common = %{epoch}:%{version}-%{release}
 Requires:	setup >= 2.4.1-3
-Requires(post,preun):	/sbin/chkconfig
 
 %description -n cWnn
 This package includes FreeWnn Chinese Input System (version for
@@ -182,9 +182,9 @@
 Summary:	tWnn Chinese Input System (version for Taiwan)
 Summary(pl):	System wprowadzania znaków chińskich tWnn (wersja dla Tajwanu)
 Group:		Applications/System
+Requires(post,preun):	/sbin/chkconfig
 Requires:	cWnn-common = %{epoch}:%{version}-%{release}
 Requires:	setup >= 2.4.1-3
-Requires(post,preun):	/sbin/chkconfig
 
 %description -n tWnn
 FreeWnn Chinese Input System (version for Taiwan).
@@ -196,10 +196,10 @@
 Summary:	kWnn Korean Input System
 Summary(pl):	System wprowadzania znaków koreańskich kWnn
 Group:		Applications/System
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	setup >= 2.4.1-3
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	kWnn-libs = %{epoch}:%{version}-%{release}
+Requires:	setup >= 2.4.1-3
 
 %description -n kWnn
 FreeWnn Korean Input System.
@@ -298,17 +298,11 @@
 cd /var/lib/wnn/ja/dic/pubdic
 %{_bindir}/wnntouch *.*
 /sbin/chkconfig --add FreeWnn
-if [ -f /var/lock/subsys/FreeWnn ]; then
-	/etc/rc.d/init.d/FreeWnn restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/FreeWnn start\" to start FreeWnn service."
-fi
+%service FreeWnn restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/FreeWnn ]; then
-		/etc/rc.d/init.d/FreeWnn stop 1>&2
-	fi
+	%service FreeWnn stop
 	/sbin/chkconfig --del FreeWnn
 fi
 
@@ -319,17 +313,11 @@
 cd /var/lib/wnn/zh_CN/dic/sys
 %{_bindir}/cwnntouch *.*
 /sbin/chkconfig --add cWnn
-if [ -f /var/lock/subsys/cWnn ]; then
-	/etc/rc.d/init.d/cWnn restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/cWnn start\" to start cWnn service."
-fi
+%service cWnn restart
 
 %preun -n cWnn
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/cWnn ]; then
-		/etc/rc.d/init.d/cWnn stop 1>&2
-	fi
+	%service cWnn stop
 	/sbin/chkconfig --del cWnn
 fi
 
@@ -340,17 +328,11 @@
 cd /var/lib/wnn/zh_TW/dic/sys
 %{_bindir}/cwnntouch *.*
 /sbin/chkconfig --add tWnn
-if [ -f /var/lock/subsys/tWnn ]; then
-	/etc/rc.d/init.d/tWnn restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/tWnn start\" to start tWnn service."
-fi
+%service tWnn restart
 
 %preun -n tWnn
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/tWnn ]; then
-		/etc/rc.d/init.d/tWnn stop 1>&2
-	fi
+	%service tWnn stop
 	/sbin/chkconfig --del tWnn
 fi
 
@@ -358,17 +340,11 @@
 cd /var/lib/wnn/ko_KR/dic/sys
 %{_bindir}/kwnntouch *.*
 /sbin/chkconfig --add kWnn
-if [ -f /var/lock/subsys/kWnn ]; then
-	/etc/rc.d/init.d/kWnn restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/kWnn start\" to start kWnn service."
-fi
+%service kWnn restart
 
 %preun -n kWnn
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/kWnn ]; then
-		/etc/rc.d/init.d/kWnn stop 1>&2
-	fi
+	%service kWnn stop
 	/sbin/chkconfig --del kWnn
 fi
 
@@ -547,6 +523,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2006/03/19 17:50:57  glen
+- use %service
+
 Revision 1.20  2005/12/12 16:24:19  glen
 - adapterized (sorted %verify attrs)
 

================================================================
Index: SPECS/GNUnet.spec
diff -u SPECS/GNUnet.spec:1.21 SPECS/GNUnet.spec:1.22
--- SPECS/GNUnet.spec:1.21	Mon May  2 23:01:00 2005
+++ SPECS/GNUnet.spec	Sun Mar 19 18:50:57 2006
@@ -8,8 +8,8 @@
 Name:		GNUnet
 Version:	0.6.5
 Release:	0.1
-Group:		Applications/Networking
 License:	GPL
+Group:		Applications/Networking
 Source0:	http://www.ovmj.org/GNUnet/download/%{name}-%{version}.tar.bz2
 # Source0-md5:	8bca32b55dccdb5bde7bd2b38df9df03
 Source1:	gnunet.init
@@ -28,31 +28,31 @@
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	mysql-devel >= 3.23.56
 BuildRequires:	openssl-devel >= 0.9.7d
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tdb-devel
-PreReq:		rc-scripts
+Requires(post,postun):	/sbin/ldconfig
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(post,postun):	/sbin/ldconfig
-Requires(post,preun):	/sbin/chkconfig
 Requires:	gdbm
 Requires:	gtk+ >= 1.2
 Requires:	libextractor >= 0.3.10
 Requires:	openssl >= 0.9.7d
+Requires:	rc-scripts
 Provides:	group(gnunet)
 Provides:	user(gnunet)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	_gnunethomedir	/var/lib/GNUnet
+%define		_gnunethomedir	/var/lib/GNUnet
 
 %description
 GNUnet is framework for secure peer-to-peer networking. The primary
 application for GNUnet is anonymous file-sharing. GNUnet is part of
-the GNU project (http://www.gnu.org/).
+the GNU project <http://www.gnu.org/>.
 
 While GNUnet file-sharing provides anonymity for its users, it also
 provides accounting to perform better resource allocation.
@@ -73,8 +73,7 @@
 participants.
 
 For a more detailed description of GNUnet, see our webpages at:
-
-http://www.gnu.org/software/GNUnet/ and http://www.ovmj.org/GNUnet/
+<http://www.gnu.org/software/GNUnet/> and <http://www.ovmj.org/GNUnet/>
 
 Note that this RPM contains only plain directories database frontend;
 bdb, gdbm, mysql and tdb frontends are in separate subpackages.
@@ -104,8 +103,7 @@
 względu na małą liczbę aktywnych uczestników.
 
 Bardziej szczegółowy opis GNUnet można znaleźć na stronie:
-
-http://www.gnu.org/software/GNUnet/ i http://www.ovmj.org/GNUnet/
+<http://www.gnu.org/software/GNUnet/> i <http://www.ovmj.org/GNUnet/>
 
 Należy też zauważyć, że ten pakiet zawiera tylko interfejs bazodanowy
 dla zwykłych katalogów; wtyczki obsługujące bazy bdb, gdbm, mysql i
@@ -212,17 +210,13 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add gnunet
-if [ -f /var/lock/subsys/gnunet ]; then
-	/etc/rc.d/init.d/gnunet restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/gnunet start\" to start GNUnet." >&2
-fi
+%service gnunet restart "GNUnet"
 
 %preun
-if [ -f /var/lock/subsys/gnunet ]; then
-	/etc/rc.d/init.d/gnunet stop
+if [ "$1" = 0 ]; then
+	%service gnunet stop
+	/sbin/chkconfig --del gnunet
 fi
-/sbin/chkconfig --del gnunet
 
 %postun
 /sbin/ldconfig
@@ -299,7 +293,7 @@
 %endif
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gnunet.conf
-%{_sysconfdir}/skel/.gnunet
+/etc/skel/.gnunet
 %attr(754,root,root) /etc/rc.d/init.d/gnunet
 %{_mandir}/man1/gnunet-chat.1*
 %{_mandir}/man1/gnunet-check.1*
@@ -361,6 +355,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2006/03/19 17:50:57  glen
+- use %service
+
 Revision 1.21  2005/05/02 21:01:00  qboosh
 - known Group for subpackages
 

================================================================
Index: SPECS/NetworkManager.spec
diff -u SPECS/NetworkManager.spec:1.8 SPECS/NetworkManager.spec:1.9
--- SPECS/NetworkManager.spec:1.8	Wed Dec 28 13:14:37 2005
+++ SPECS/NetworkManager.spec	Sun Mar 19 18:50:57 2006
@@ -1,9 +1,8 @@
 # $Revision$, $Date$
-#
 # TODO:
 # - add a working(!) pld backend...
 # - many files are not packaged (including init.d)
-# 
+#
 Summary:	Network Manager for GNOME
 Summary(pl):	Zarządca sieci dla GNOME
 Name:		NetworkManager
@@ -20,7 +19,11 @@
 BuildRequires:	gnome-panel-devel
 BuildRequires:	hal-devel >= 0.5.2
 BuildRequires:	libiw-devel >= 28
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post):	/sbin/ldconfig
+Requires(post,preun):	/sbin/chkconfig
 Requires:	dhcdbd
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,22 +60,15 @@
 /sbin/ldconfig
 %gconf_schema_install
 /sbin/chkconfig --add NetworkManager
-if [ -f /var/lock/subsys/NetworkManager ]; then
-	/etc/rc.d/init.d/dhcdbd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/NetworkManager start\" to start NetworkManager daemon."
-fi
+%service NetworkManager restart "NetworkManager daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/NetworkManager ]; then
-		/etc/rc.d/init.d/NetworkManager stop 1>&2
-	fi
-	[ ! -x /sbin/chkconfig ] || /sbin/chkconfig --del NetworkManager
+	%service NetworkManager stop
+	/sbin/chkconfig --del NetworkManager
 fi
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -91,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2006/03/19 17:50:57  glen
+- use %service
+
 Revision 1.8  2005/12/28 12:14:37  wrobell
 - fixed build requirements for wireless tools library
 

================================================================
Index: SPECS/OpenPBS.spec
diff -u SPECS/OpenPBS.spec:1.7 SPECS/OpenPBS.spec:1.8
--- SPECS/OpenPBS.spec:1.7	Thu Mar 10 22:53:00 2005
+++ SPECS/OpenPBS.spec	Sun Mar 19 18:50:57 2006
@@ -17,6 +17,7 @@
 Source7:	pbsconfig
 Source8:	patch.ko
 URL:		http://www.openpbs.org/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	tcl
 Requires:	tk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,9 +41,9 @@
 Summary:	PBS client daemon: pbs_mom
 Summary(pl):	Demon kliencki PBS: pbs_mom
 Group:		Applications/Networking
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
+Requires:	rc-scripts
 
 %description mom
 This package contains the PBS client daemon pbs_mom executable and
@@ -55,9 +56,9 @@
 Summary:	PBS server daemon: pbs_server
 Summary(pl):	Demon serwera PBS: pbs_server
 Group:		Applications/Networking
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
+Requires:	rc-scripts
 
 %description server
 This package contains the PBS server daemon pbs_server executable and
@@ -71,9 +72,9 @@
 Summary:	PBS scheduler daemon: pbs_sched
 Summary(pl):	Demon schedulera PBS: pbs_sched
 Group:		Applications/Networking
-PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}-%{release}
+Requires:	rc-scripts
 
 %description sched
 This package contains the PBS scheduler daemon pbs_sched executable
@@ -103,9 +104,8 @@
 cp src/scheduler.cc/samples/fifo/Makefile src/scheduler.cc/samples/fifo/Makefile.orig
 
 %install
-
-# make directories
 rm -rf $RPM_BUILD_ROOT
+# make directories
 install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
 install -d $RPM_BUILD_ROOT%{_datadir}
 install -d $RPM_BUILD_ROOT/var/spool/pbs
@@ -115,14 +115,14 @@
 # kludge scheduler install
 cat src/scheduler.cc/samples/fifo/Makefile.orig | sed -e 's|%{_prefix}|$(RPM_BUILD_ROOT)%{_prefix}|' | sed -e 's|/var/spool|$(RPM_BUILD_ROOT)/var/spool|' >src/scheduler.cc/samples/fifo/Makefile
 # run make install
-#make install prefix=$RPM_BUILD_ROOT/usr PBS_SERVER_HOME=$RPM_BUILD_ROOT/var/spool/pbs
+#make install prefix=$RPM_BUILD_ROOT%{_prefix} PBS_SERVER_HOME=$RPM_BUILD_ROOT/var/spool/pbs
 %{__make} install prefix=$RPM_BUILD_ROOT%{_prefix}
 # copy docs
-#cp INSTALL PBS_License.text Read.Me Release_Notes $RPM_BUILD_ROOT/usr
+#cp INSTALL PBS_License.text Read.Me Release_Notes $RPM_BUILD_ROOT%{_prefix}
 # copy startup files
 cp pbs_mom pbs_server pbs_sched $RPM_BUILD_ROOT/etc/rc.d/init.d
 # copy scripts
-#cp pbsenv.sh pbsenv.csh $RPM_BUILD_ROOT/usr/bin
+#cp pbsenv.sh pbsenv.csh $RPM_BUILD_ROOT%{_bindir}
 cp pbsrun pbsconfig $RPM_BUILD_ROOT%{_bindir}
 # make sure all the config files exist
 touch $RPM_BUILD_ROOT/var/spool/pbs/default_server
@@ -136,49 +136,31 @@
 
 %post mom
 /sbin/chkconfig --add pbs_mom
-if [ -f /var/lock/subsys/pbs_mom ]; then
-	/etc/rc.d/init.d/pbs_mom restart >/dev/null 2>&1
-else
-	echo "Run \"/etc/rc.d/init.d/pbs_mom start\" to start pbs_mom daemon."
-fi
+%service pbs_mom restart "pbs_mom daemon"
 
 %preun mom
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/pbs_mom ]; then
-		/etc/rc.d/init.d/pbs_mom stop >&2
-	fi
+	%service pbs_mom stop
 	/sbin/chkconfig --del pbs_mom
 fi
 
 %post server
 /sbin/chkconfig --add pbs_server
-if [ -f /var/lock/subsys/pbs_server ]; then
-	/etc/rc.d/init.d/pbs_server restart >/dev/null 2>&1
-else
-	echo "Run \"/etc/rc.d/init.d/pbs_server start\" to start pbs_server daemon."
-fi
+%service pbs_server restart "pbs_server daemon"
 
 %preun server
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/pbs_server ]; then
-		/etc/rc.d/init.d/pbs_server stop >&2
-	fi
+	%service pbs_server stop
 	/sbin/chkconfig --del pbs_server
 fi
 
 %post sched
 /sbin/chkconfig --add pbs_sched
-if [ -f /var/lock/subsys/pbs_shed ]; then
-	/etc/rc.d/init.d/pbs_shed restart >/dev/null 2>&1
-else
-	echo "Run \"/etc/rc.d/init.d/pbs_shed start\" to start pbs_shed daemon."
-fi
+%service pbs_shed restart "pbs_shed daemon"
 
 %preun sched
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/pbs_sched ]; then
-		/etc/rc.d/init.d/pbs_sched stop >&2
-	fi
+	%service pbs_sched stop
 	/sbin/chkconfig --del pbs_sched
 fi
 
@@ -193,8 +175,8 @@
 %attr(755,root,root) %{_bindir}/pbs_tclsh
 %attr(755,root,root) %{_bindir}/pbsconfig
 %attr(755,root,root) %{_bindir}/pbsdsh
-#/usr/bin/pbsenv.csh
-#/usr/bin/pbsenv.sh
+#%{_bindir}/pbsenv.csh
+#%{_bindir}/pbsenv.sh
 %attr(755,root,root) %{_bindir}/pbsnodes
 %attr(755,root,root) %{_bindir}/pbsrun
 %attr(755,root,root) %{_bindir}/printjob
@@ -228,7 +210,7 @@
 %{_libdir}/libpbs.a
 %{_libdir}/libsite.a
 %{_libdir}/pbs_sched.a
-#/usr/lib/pbs
+#%{_prefix}/lib/pbs
 %{_includedir}/pbs_error.h
 %{_includedir}/pbs_ifl.h
 %{_includedir}/tm.h
@@ -282,6 +264,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/DenyHosts.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SPECS/Firebird.spec?r1=1.31&r2=1.32&f=u
    http://cvs.pld-linux.org/SPECS/FreeWnn.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/GNUnet.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/NetworkManager.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/OpenPBS.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/PowerChutePlus.spec?r1=1.23&r2=1.24&f=u
    http://cvs.pld-linux.org/SPECS/STonX.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/TiMidity++.spec?r1=1.80&r2=1.81&f=u
    http://cvs.pld-linux.org/SPECS/VMware-server.spec?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SPECS/VMware-workstation.spec?r1=1.83&r2=1.84&f=u
    http://cvs.pld-linux.org/SPECS/WebChess.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/XFree86.spec?r1=1.617&r2=1.618&f=u



More information about the pld-cvs-commit mailing list