SPECS: horde.spec - use %service in triggers
glen
glen at pld-linux.org
Sun Jan 8 21:26:40 CET 2006
Author: glen Date: Sun Jan 8 20:26:40 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service in triggers
---- Files affected:
SPECS:
horde.spec (1.130 -> 1.131)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.130 SPECS/horde.spec:1.131
--- SPECS/horde.spec:1.130 Fri Jan 6 17:12:41 2006
+++ SPECS/horde.spec Sun Jan 8 21:26:34 2006
@@ -15,7 +15,7 @@
%define _hordeapp horde
#define _snap 2005-10-17
%define _rc rc1
-%define _rel 1
+%define _rel 1.1
#
%include /usr/lib/rpm/macros.php
Summary: The common Horde Framework for all Horde modules
@@ -39,7 +39,7 @@
Patch4: %{name}-config-xml.patch
URL: http://www.horde.org/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
%if %{with autodeps}
BuildRequires: php-pear-Crypt_Rc4
@@ -281,16 +281,12 @@
if [ -L /etc/apache/conf.d/99_horde.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde.conf
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache reload 1>&2
- fi
+ %service -q apache reload
fi
if [ -L /etc/httpd/httpd.conf/99_horde.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -333,6 +329,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.131 2006/01/08 20:26:34 glen
+- use %service in triggers
+
Revision 1.130 2006/01/06 16:12:41 paszczus
- more _noautoreq
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.130&r2=1.131&f=u
More information about the pld-cvs-commit
mailing list