SPECS: ser.spec - cosmetics - use %service (now without typos)

glen glen at pld-linux.org
Wed Apr 11 10:43:24 CEST 2007


Author: glen                         Date: Wed Apr 11 08:43:24 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics
- use %service (now without typos)

---- Files affected:
SPECS:
   ser.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/ser.spec
diff -u SPECS/ser.spec:1.12 SPECS/ser.spec:1.13
--- SPECS/ser.spec:1.12	Wed Apr 11 08:55:20 2007
+++ SPECS/ser.spec	Wed Apr 11 10:43:19 2007
@@ -20,6 +20,7 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	mysql-devel
 BuildRequires:	radiusclient-ng-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
@@ -105,6 +106,8 @@
 %patch0 -p1
 sed -i -e 's#modules-dir = lib/ser/modules/#modules-dir = %{_lib}/ser/modules/#g' Makefile.defs
 
+find -type d -name CVS | xargs rm -rf
+
 %build
 %{__make} all \
 	exclude_modules="" \
@@ -116,8 +119,6 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{ser,sysconfig,rc.d/init.d}
 
-find . -type d -name CVS -exec rm -rf "{}" ";"
-
 %{__make} install \
 	exclude_modules="" \
 	PREFIX="%{_prefix}" \
@@ -144,17 +145,11 @@
 
 %post
 /sbin/chkconfig --add ser
-if [ -f /var/lock/subsys/ser ]; then
-	etc/rc.d/init.d/ser restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/ser start\" to start sip Daemon."
-fi
+%service ser restart "sip Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/ser ]; then
-		/etc/rc.d/init.d/ser stop 1>&2
-fi
+	%service openser stop
 	/sbin/chkconfig --del ser
 fi
 
@@ -240,6 +235,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/04/11 08:43:19  glen
+- cosmetics
+- use %service (now without typos)
+
 Revision 1.12  2007/04/11 06:55:20  arekm
 - important note
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ser.spec?r1=1.12&r2=1.13&f=u



More information about the pld-cvs-commit mailing list