SPECS: mantis.spec - use %service in trigger to respect skip auto ...

[glen]

Author: glen                         Date: Wed Jan  4 14:14:09 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use %service in trigger to respect skip auto restarts of services
- sorted preambles
- rel 2

---- Files affected:
SPECS:
   mantis.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/mantis.spec
diff -u SPECS/mantis.spec:1.33 SPECS/mantis.spec:1.34
--- SPECS/mantis.spec:1.33	Sat Dec 24 14:38:17 2005
+++ SPECS/mantis.spec	Wed Jan  4 15:14:04 2006
@@ -5,7 +5,7 @@
 Summary(pl):	Mantis - system kontroli błędów
 Name:		mantis
 Version:	0.19.4
-Release:	1
+Release:	2
 License:	GPL
 Group:		Development/Tools
 Source0:	http://dl.sourceforge.net/mantisbt/%{name}-%{version}.tar.gz
@@ -15,15 +15,15 @@
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-doc.patch
 URL:		http://mantisbt.sourceforge.net/
-BuildRequires:	rpmbuild(macros) >= 1.264
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires(triggerpostun):	sed >= 4.0
-Requires:	webapps
-Requires:	webserver = apache
 Requires:	apache(mod_dir)
 Requires:	php >= 3:4.3.1-4
 Requires:	php-mysql >= 3:4.3.1-4
 Requires:	php-pcre >= 3:4.3.1-4
+Requires:	webapps
+Requires:	webserver = apache
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,7 +43,7 @@
 Summary:	Mantis setup package
 Summary(pl):	Pakiet do wstępnej konfiguracji Mantisa
 Group:		Applications/WWW
-PreReq:		%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description setup
 Install this package to configure initial Mantis installation. You
@@ -176,14 +176,10 @@
 fi
 
 if [ "$httpd_reload" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
+	%service httpd reload
 fi
 if [ "$apache_reload" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
+	%service apache reload
 fi
 
 %files
@@ -240,6 +236,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2006/01/04 14:14:04  glen
+- use %service in trigger to respect skip auto restarts of services
+- sorted preambles
+- rel 2
+
 Revision 1.33  2005/12/24 13:38:17  glen
 - fix php program dep
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mantis.spec?r1=1.33&r2=1.34&f=u