SPECS: tenshi.spec - convert PreReq to Requires for new rpm - perl...

glen glen at pld-linux.org
Wed Jul 27 16:01:09 CEST 2005


Author: glen                         Date: Wed Jul 27 14:01:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- convert PreReq to Requires for new rpm
- perl dependencies autodetected (using macros.perl)
- use %service macro

---- Files affected:
SPECS:
   tenshi.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/tenshi.spec
diff -u SPECS/tenshi.spec:1.7 SPECS/tenshi.spec:1.8
--- SPECS/tenshi.spec:1.7	Sun Jul 24 16:44:28 2005
+++ SPECS/tenshi.spec	Wed Jul 27 16:01:01 2005
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.perl
 Summary:	Log parsing and notification program
 Summary(pl):	Program do analizy logów i powiadamiania
 Name:		tenshi
@@ -11,10 +12,10 @@
 Source1:	%{name}.init
 Patch0:		%{name}-root.patch
 URL:		http://www.gentoo.org/proj/en/infrastructure/tenshi/index.xml
-PreReq:		rc-scripts
+BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpm-perlprov
+Requires(post,preun):	rc-scripts
 Requires(post,preun):	/sbin/chkconfig
-Requires:	perl-base >= 1:5.6
-Requires:	perl-modules >= 1:5.8.0
 Obsoletes:	wasabi
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,17 +70,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-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
+	%service -q %{name} stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -98,6 +93,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/07/27 14:01:01  glen
+- convert PreReq to Requires for new rpm
+- perl dependencies autodetected (using macros.perl)
+- use %service macro
+
 Revision 1.7  2005/07/24 14:44:28  darekr
 - updated to 0.3.4
 - %verify for config file, md5sum
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tenshi.spec?r1=1.7&r2=1.8&f=u




More information about the pld-cvs-commit mailing list