Author: glen Date: Wed Jan 11 15:36:03 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service macro
---- Files affected:
SPECS:
eventum.spec (1.141 -> 1.142)
---- Diffs:
================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.141 SPECS/eventum.spec:1.142
--- SPECS/eventum.spec:1.141 Sat Jan 7 01:13:54 2006
+++ SPECS/eventum.spec Wed Jan 11 16:35:58 2006
@@ -17,7 +17,7 @@
# release candidate
#define _rc 2
-%define _rel 3.4
+%define _rel 3.6
%if 0%{?_rc:1}
%define _source http://eventum.mysql.org/eventum-1.7.0.tar.gz
@@ -74,7 +74,7 @@
Patch17: eventum-new-issue.patch
URL: http://dev.mysql.com/downloads/other/eventum/
%{?with_pear:BuildRequires: rpm-php-pearprov >= 4.0.2-98}
-BuildRequires: rpmbuild(macros) >= 1.223
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
Requires: %{name}-base = %{version}-%{release}
Requires: Smarty >= 2.6.2
@@ -722,11 +722,7 @@
%post irc
/sbin/chkconfig --add eventum-irc
-if [ -f /var/lock/subsys/eventum-irc ]; then
- /etc/rc.d/init.d/eventum-irc restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/eventum-irc start\" to start Eventum IRC
Bot." >&2
-fi
+%service eventum-irc restart "Eventum IRC Bot"
%triggerin -- apache1
%webapp_register apache %{_webapp}
@@ -803,16 +799,12 @@
if [ -L /etc/apache/conf.d/99_%{_webapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_%{_webapp}.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_%{_webapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_%{_webapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%{_appdir}/upgrade/upgrade.sh %{_appdir}/upgrade/v1.6.1_to_v1.7.0 <<EOF
@@ -975,6 +967,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.142 2006/01/11 15:35:58 glen
+- use %service macro
+
Revision 1.141 2006/01/07 00:13:54 glen
- use /etc/eventum for non-webapps (cli, scm)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.141&r2=1.142&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
