SPECS: capsel.spec, ccs.spec, cflowd.spec, cisco-vpnclient.spec, c...

glen glen at pld-linux.org
Sun Apr 16 23:05:44 CEST 2006 

Author: glen                         Date: Sun Apr 16 21:05:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service

---- Files affected:
SPECS:
   capsel.spec (1.35 -> 1.36) , ccs.spec (1.11 -> 1.12) , cflowd.spec (1.7 -> 1.8) , cisco-vpnclient.spec (1.13 -> 1.14) , clusternfs.spec (1.14 -> 1.15) , coda.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: SPECS/capsel.spec
diff -u SPECS/capsel.spec:1.35 SPECS/capsel.spec:1.36
--- SPECS/capsel.spec:1.35	Mon Dec 12 16:19:32 2005
+++ SPECS/capsel.spec	Sun Apr 16 23:05:39 2006
@@ -6,14 +6,14 @@
 %define		_orig_name	capsel
 %define		_pre		rc1
 
+%define	_rel	11
 Summary:	Capsel - supports Linux-Privs security model
 Summary(pl):	Capsel - obsługa modelu bezpieczeństwa Linux-Privs
 Name:		%{_orig_name}
 Version:	2.0
-%define	_rel	11
 Release:	%{_pre}.%{_rel}
-Group:		Base/Kernel
 License:	GPL v2
+Group:		Base/Kernel
 Source0:	http://cliph.linux.pl/capsel/capsel-%{version}%{_pre}.tar.gz
 # Source0-md5:	f886467eb458812f8ee426541c7e4e06
 Source1:	%{name}.init
@@ -23,10 +23,10 @@
 URL:		http://cliph.linux.pl/capsel/
 BuildRequires:	%{kgcc_package}
 %{?with_dist_kernel:BuildRequires:	kernel-headers}
-BuildRequires:	rpmbuild(macros) >= 1.118
-Requires:	rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 %{?with_dist_kernel:Requires:	kernel(capsel)}
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -103,17 +103,11 @@
 
 %post
 /sbin/chkconfig --add capsel
-if [ -f /var/lock/subsys/capsel ]; then
-	/etc/rc.d/init.d/capsel restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/capsel start\" to start capsel."
-fi
+%service capsel restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/capsel ]; then
-		/etc/rc.d/init.d/capsel stop 1>&2
-	fi
+	%service capsel stop
 	/sbin/chkconfig --del capsel
 fi
 
@@ -151,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/04/16 21:05:39  glen
+- use %service
+
 Revision 1.35  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/ccs.spec
diff -u SPECS/ccs.spec:1.11 SPECS/ccs.spec:1.12
--- SPECS/ccs.spec:1.11	Tue Nov  8 20:51:38 2005
+++ SPECS/ccs.spec	Sun Apr 16 23:05:39 2006
@@ -13,7 +13,8 @@
 URL:		http://sources.redhat.com/cluster/ccs/
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	magma-devel >= 0:1.01
-BuildRequires:	perl-base
+BuildRequires:	sed >= 4.0
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	magma >= 0:1.01
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,7 +42,7 @@
 %prep
 %setup -q -n cluster-%{version}
 cd %{name}
-%{__perl} -pi -e 's/-O2/%{rpmcflags}/' {ccs_tool,ccs_test,lib,daemon}/Makefile
+%{__sed} -i -e 's/-O2/%{rpmcflags}/' {ccs_tool,ccs_test,lib,daemon}/Makefile
 
 %build
 cd %{name}
@@ -73,18 +74,12 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-        /etc/rc.d/init.d/%{name} restart 1>&2
-else
-        echo "Type \"/etc/rc.d/init.d/%{name} start\" to start %{name}" 1>&2
-fi
+%service %{name} restart
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/%{name} ]; then
-                /etc/rc.d/init.d/%{name} stop >&2
-        fi
-        /sbin/chkconfig --del %{name}
+	%service %{name} stop
+	/sbin/chkconfig --del %{name}
 fi
 
 %files
@@ -109,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2006/04/16 21:05:39  glen
+- use %service
+
 Revision 1.11  2005/11/08 19:51:38  qboosh
 - require magma 1.01
 

================================================================
Index: SPECS/cflowd.spec
diff -u SPECS/cflowd.spec:1.7 SPECS/cflowd.spec:1.8
--- SPECS/cflowd.spec:1.7	Tue Dec 13 19:01:46 2005
+++ SPECS/cflowd.spec	Sun Apr 16 23:05:39 2006
@@ -24,6 +24,7 @@
 BuildRequires:	flex
 BuildRequires:	libtool >= 2:1.4d-3
 BuildRequires:	perl-base
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	rc-scripts
@@ -110,7 +111,7 @@
 %configure \
 	--enable-shared
 
-perl -pi -e 's#libtool#libtool --tag=CXX#g' Makefile* */Makefile* */*/Makefile* */*/*/Makefile*
+sed -i -e 's#libtool#libtool --tag=CXX#g' Makefile* */Makefile* */*/Makefile* */*/*/Makefile*
 
 %{__make} \
 	ARTSPPINC="-I%{_includedir}/arts++" \
@@ -142,17 +143,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 %{name} service."
-fi
+%service %{name} restart
 
 %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
 
@@ -190,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/04/16 21:05:39  glen
+- use %service
+
 Revision 1.7  2005/12/13 18:01:46  glen
 - adapterized (avoid macros with /usr/include/{ncurses,freetype}*)
 

================================================================
Index: SPECS/cisco-vpnclient.spec
diff -u SPECS/cisco-vpnclient.spec:1.13 SPECS/cisco-vpnclient.spec:1.14
--- SPECS/cisco-vpnclient.spec:1.13	Wed Apr 12 14:15:40 2006
+++ SPECS/cisco-vpnclient.spec	Sun Apr 16 23:05:39 2006
@@ -27,7 +27,7 @@
 NoSource:	1
 URL:		http://www.cisco.com/en/US/products/sw/secursw/ps2308/tsd_products_support_series_home.html
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 3:2.6.0}
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.268
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -143,18 +143,12 @@
 
 %post
 /sbin/chkconfig --add cisco-vpnclient
-if [ -f /var/lock/subsys/cisco-vpnclient ]; then
-        /etc/rc.d/init.d/cisco-vpnclient restart >&2
-else
-        echo "Run '/etc/rc.d/init.d/cisco-vpnclient start' to start vpnclient support." >&2
-fi
+%service cisco-vpnclient restart
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/cisco-vpnclient ]; then
-                /etc/rc.d/init.d/cisco-vpnclient stop >&2
-        fi
-        /sbin/chkconfig --del cisco-vpnclient >&2
+	%service cisco-vpnclient stop
+	/sbin/chkconfig --del cisco-vpnclient >&2
 fi
 
 %post	-n kernel-net-cisco_ipsec
@@ -207,6 +201,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2006/04/16 21:05:39  glen
+- use %service
+
 Revision 1.13  2006/04/12 12:15:40  glen
 - add kernel epoch, adapterized
 

================================================================
Index: SPECS/clusternfs.spec
diff -u SPECS/clusternfs.spec:1.14 SPECS/clusternfs.spec:1.15
--- SPECS/clusternfs.spec:1.14	Mon Dec 12 16:19:32 2005
+++ SPECS/clusternfs.spec	Sun Apr 16 23:05:39 2006
@@ -15,11 +15,13 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libwrap-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	portmap >= 4.0
 Requires:	rc-scripts
 Provides:	nfscluster
-Conflicts:	nfs-utils nfs-server
+Conflicts:	nfs-server
+Conflicts:	nfs-utils
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -44,7 +46,7 @@
 	--rquotad=no \
 	--ugidd=no --nis=yes \
 	--hosts-access=yes \
-	--libwrap-directory=/usr/lib \
+	--libwrap-directory=%{_prefix}/lib \
 	--exports-uid=0 --exports-gid=0 \
 	--log-mounts=yes --multi=yes \
 	--devtab=yes --trnames=yes \
@@ -70,17 +72,11 @@
 
 %post
 /sbin/chkconfig --add clusternfs
-if [ -r /var/lock/subsys/clusternfs ]; then
-	/etc/rc.d/init.d/clusternfs restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/clusternfs start\" to start nfs daemon."
-fi
+%service clusternfs restart "NFS daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -r /var/lock/subsys/clusternfs ]; then
-		/etc/rc.d/init.d/clusternfs stop >&2
-	fi
+	%service clusternfs stop
 	/sbin/chkconfig --del clusternfs
 fi
 
@@ -101,6 +97,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2006/04/16 21:05:39  glen
+- use %service
+
 Revision 1.14  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 

================================================================
Index: SPECS/coda.spec
diff -u SPECS/coda.spec:1.63 SPECS/coda.spec:1.64
--- SPECS/coda.spec:1.63	Mon Dec 12 16:19:32 2005
+++ SPECS/coda.spec	Sun Apr 16 23:05:39 2006
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 # TODO:
 #   - FHS (at least /usr/coda, /var/coda - assuming that /coda is special)
 #   - separate some programs to coda-common package
@@ -32,6 +31,7 @@
 BuildRequires:	ncurses-devel
 BuildRequires:	readline-devel
 BuildRequires:	rpc2-devel >= 1.28
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	rvm-devel
 BuildRequires:	rvm-tools
 Requires:	bc
@@ -162,7 +162,7 @@
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/codasrv
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/update
 
-%{__perl} -pi -e "s!usr/coda!var/lib/coda!" $RPM_BUILD_ROOT/etc/coda/*
+%{__perl} -pi -e "s!usr/coda!var/lib/coda!" $RPM_BUILD_ROOT%{_sysconfdir}/coda/*
 
 install -d $RPM_BUILD_ROOT/var/lib/coda/vice/{auth2,db,misc,spool,srv,vol}
 
@@ -179,17 +179,13 @@
 fi
 
 %post client
-if [ -e /etc/coda/vstab ]; then
+if [ -e %{_sysconfdir}/coda/vstab ]; then
 	touch /var/lib/coda/venus.cache/INIT
 else
 	%{_sbindir}/venus-setup testserver.coda.cs.cmu.edu 40000
 fi
 /sbin/chkconfig --add venus
-if [ -f /var/lock/subsys/venus ]; then
-	/etc/rc.d/init.d/venus restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/venus start\" to start venus." >&2
-fi
+%service venus restart
 
 %preun client
 grep "^coda" /proc/mounts > /dev/null 2>&1
@@ -200,45 +196,29 @@
 	exit 0
 fi
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/venus ]; then
-		/etc/rc.d/init.d/venus stop >&2
-	fi
+	%service venus stop
 	/sbin/chkconfig --del venus
 fi
 
 %post server
 /sbin/chkconfig --add auth2
-if [ -f /var/lock/subsys/auth2 ]; then
-	/etc/rc.d/init.d/auth2 restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/auth2 start\" to start auth." >&2
-fi
+%service auth2 restart
+
 /sbin/chkconfig --add update
-if [ -f /var/lock/subsys/update ]; then
-	/etc/rc.d/init.d/update restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/update start\" to start update." >&2
-fi
+%service update restart
+
 /sbin/chkconfig --add codasrv
-if [ -f /var/lock/subsys/codasrv ]; then
-	/etc/rc.d/init.d/codasrv restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/codasrv start\" to start codasrv." >&2
-fi
+%service codasrv restart
 
 %preun server
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/update ]; then
-		/etc/rc.d/init.d/update stop >&2
-	fi
+	%service update stop
 	/sbin/chkconfig --del update
-	if [ -f /var/lock/subsys/auth2 ]; then
-		/etc/rc.d/init.d/auth2 stop >&2
-	fi
+
+	%service auth2 stop
 	/sbin/chkconfig --del auth2
-	if [ -f /var/lock/subsys/codasrv ]; then
-		/etc/rc.d/init.d/codasrv stop >&2
-	fi
+
+	%service codasrv stop
 	/sbin/chkconfig --del codasrv
 fi
 
@@ -393,6 +373,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2006/04/16 21:05:39  glen
+- use %service
+
 Revision 1.63  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/capsel.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/ccs.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/cflowd.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/cisco-vpnclient.spec?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/SPECS/clusternfs.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/coda.spec?r1=1.63&r2=1.64&f=u

More information about the pld-cvs-commit mailing list