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

glen glen at pld-linux.org
Wed Apr 11 10:38:18 CEST 2007


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

---- Files affected:
SPECS:
   openser.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/openser.spec
diff -u SPECS/openser.spec:1.1 SPECS/openser.spec:1.2
--- SPECS/openser.spec:1.1	Wed Apr 11 09:39:56 2007
+++ SPECS/openser.spec	Wed Apr 11 10:38:13 2007
@@ -22,6 +22,7 @@
 BuildRequires:	openssl-devel
 BuildRequires:	perl-devel
 BuildRequires:	radiusclient-ng-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	unixODBC-devel
 #BuildRequires:	xmlrpc-c-devel >= 1.10.0
 BuildRequires:	zlib-devel
@@ -136,6 +137,8 @@
 %setup -q -n %{name}-%{version}-tls
 %patch0 -p1
 
+find -type d -name CVS | xargs rm -rf
+
 %build
 %{__make} all \
 	exclude_modules="%{exclude_modules}" \
@@ -148,8 +151,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="%{exclude_modules}" \
 	PREFIX="%{_prefix}" \
@@ -176,17 +177,11 @@
 
 %post
 /sbin/chkconfig --add openser
-if [ -f /var/lock/subsys/openser ]; then
-	etc/rc.d/init.d/openser restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/openser start\" to start sip Daemon."
-fi
+%service openser restart "sip Daemon"
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/openser ]; then
-		/etc/rc.d/init.d/openser stop 1>&2
-fi
+	%service openser stop
 	/sbin/chkconfig --del openser
 fi
 
@@ -299,6 +294,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2007/04/11 08:38:13  glen
+- cosmetics
+- use %service (now without typos)
+
 Revision 1.1  2007/04/11 07:39:56  arekm
 - initial
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openser.spec?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list