SPECS: horde-klutz.spec, horde-kronolith.spec, horde-mimp.spec, ho...
glen
glen at pld-linux.org
Sun Jan 8 21:28:33 CET 2006
Author: glen Date: Sun Jan 8 20:28:33 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use %service in triggers
- trigger also on old package name
---- Files affected:
SPECS:
horde-klutz.spec (1.13 -> 1.14) , horde-kronolith.spec (1.36 -> 1.37) , horde-mimp.spec (1.17 -> 1.18) , horde-mnemo.spec (1.16 -> 1.17) , horde-nag.spec (1.19 -> 1.20) , horde-trean.spec (1.14 -> 1.15) , horde-turba.spec (1.63 -> 1.64) , horde-ulaform.spec (1.8 -> 1.9) , horde-whups.spec (1.18 -> 1.19) , horde-wicked.spec (1.15 -> 1.16)
---- Diffs:
================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.13 SPECS/horde-klutz.spec:1.14
--- SPECS/horde-klutz.spec:1.13 Fri Dec 2 18:57:44 2005
+++ SPECS/horde-klutz.spec Sun Jan 8 21:28:27 2006
@@ -4,7 +4,7 @@
%define _hordeapp klutz
%define _snap 2005-08-01
#define _rc rc1
-%define _rel 0.4
+%define _rel 0.9
#
%include /usr/lib/rpm/macros.php
Summary: Horde comics-fetching module
@@ -19,7 +19,7 @@
Source1: %{_hordeapp}.conf
URL: http://www.horde.org/klutz/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -111,7 +111,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050801.0.3
+%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050801.0.3, %{_hordeapp}
for i in comics.php conf.php prefs.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -129,16 +129,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -168,6 +164,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.13 2005/12/02 17:57:44 glen
- proper build macros
================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.36 SPECS/horde-kronolith.spec:1.37
--- SPECS/horde-kronolith.spec:1.36 Fri Jan 6 17:08:11 2006
+++ SPECS/horde-kronolith.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp kronolith
#define _snap 2005-08-01
%define _rc rc1
-%define _rel 1
+%define _rel 1.1
#
%include /usr/lib/rpm/macros.php
Summary: Kronolith - calendar for Horde
@@ -18,7 +18,7 @@
Source1: %{_hordeapp}.conf
URL: http://www.horde.org/kronolith/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -125,7 +125,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.1
+%triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.1, %{_hordeapp}
for i in conf.php keywords.php menu.php prefs.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -143,16 +143,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -181,6 +177,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.36 2006/01/06 16:08:11 paszczus
- backing to _rel
================================================================
Index: SPECS/horde-mimp.spec
diff -u SPECS/horde-mimp.spec:1.17 SPECS/horde-mimp.spec:1.18
--- SPECS/horde-mimp.spec:1.17 Fri Dec 2 18:57:44 2005
+++ SPECS/horde-mimp.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp mimp
%define _snap 2005-11-16
#define _rc rc1
-%define _rel 0.5
+%define _rel 0.10
#
%include /usr/lib/rpm/macros.php
Summary: MIMP - a stripped down version of IMP for use on mobile phones/PDAs
@@ -18,7 +18,7 @@
Patch0: %{_hordeapp}-prefs.patch
URL: http://www.horde.org/mimp/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -107,7 +107,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20051116.0.3
+%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20051116.0.3, %{_hordeapp}
for i in conf.php filter.txt header.txt menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -125,16 +125,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -164,6 +160,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.17 2005/12/02 17:57:44 glen
- proper build macros
================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.16 SPECS/horde-mnemo.spec:1.17
--- SPECS/horde-mnemo.spec:1.16 Sun Dec 11 23:52:48 2005
+++ SPECS/horde-mnemo.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp mnemo
#define _snap 2005-08-01
#define _rc rc1
-%define _rel 1
+%define _rel 1.1
#
%include /usr/lib/rpm/macros.php
Summary: Horde notes and memos application
@@ -18,7 +18,7 @@
Patch0: %{_hordeapp}-prefs.patch
URL: http://www.horde.org/mnemo/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -113,7 +113,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 2.0.2-1.1
+%triggerpostun -- horde-%{_hordeapp} < 2.0.2-1.1, %{_hordeapp}
for i in conf.php prefs.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -131,16 +131,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -169,6 +165,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.16 2005/12/11 22:52:48 paszczus
- updated to 2.0.3 (security update)
================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.19 SPECS/horde-nag.spec:1.20
--- SPECS/horde-nag.spec:1.19 Fri Jan 6 17:05:50 2006
+++ SPECS/horde-nag.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp nag
#define _snap 2005-08-01
%define _rc rc1
-%define _rel 1
+%define _rel 1.1
#
%include /usr/lib/rpm/macros.php
Summary: Nag Task List Manager
@@ -19,7 +19,7 @@
Patch0: %{_hordeapp}-prefs.patch
URL: http://www.horde.org/nag/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -110,7 +110,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 2.0.3-1.1
+%triggerpostun -- horde-%{_hordeapp} < 2.0.3-1.1, %{_hordeapp}
for i in conf.php menu.php prefs.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -128,16 +128,12 @@
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.conf
if [ -d /etc/apache/webapps.d ]; then
/usr/sbin/webapp register apache %{_webapp}
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache reload 1>&2
- fi
+ %service -q apache reload
fi
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
if [ -d /etc/httpd/webapps.d ]; then
/usr/sbin/webapp register httpd %{_webapp}
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -166,6 +162,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.19 2006/01/06 16:05:50 paszczus
- backing to _rel
================================================================
Index: SPECS/horde-trean.spec
diff -u SPECS/horde-trean.spec:1.14 SPECS/horde-trean.spec:1.15
--- SPECS/horde-trean.spec:1.14 Fri Dec 2 18:57:44 2005
+++ SPECS/horde-trean.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp trean
%define _snap 2005-09-03
#define _rc rc1
-%define _rel 0.3
+%define _rel 0.8
#
%include /usr/lib/rpm/macros.php
Summary: Horde Bookmarks application
@@ -17,7 +17,7 @@
Source1: %{_hordeapp}.conf
URL: http://www.horde.org/trean/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
# docs say it requires 3.1, but seems work in 3.0 too
@@ -115,7 +115,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050903.0.2
+%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050903.0.2, %{_hordeapp}
for i in conf.php prefs.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -133,16 +133,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -171,6 +167,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.14 2005/12/02 17:57:44 glen
- proper build macros
================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.63 SPECS/horde-turba.spec:1.64
--- SPECS/horde-turba.spec:1.63 Fri Jan 6 17:07:20 2006
+++ SPECS/horde-turba.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp turba
#define _snap 2005-10-17
%define _rc rc1
-%define _rel 1
+%define _rel 1.1
#
%include /usr/lib/rpm/macros.php
Summary: Turba - Address book for IMP
@@ -20,7 +20,7 @@
Source2: %{_hordeapp}-trans.mo
URL: http://www.horde.org/turba/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires(triggerpostun): sed >= 4.0
Requires: apache(mod_access)
@@ -192,7 +192,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.3
+%triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.3, %{_hordeapp}
for i in attributes.php conf.php menu.php prefs.php sources.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -210,16 +210,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -252,6 +248,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.64 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.63 2006/01/06 16:07:20 paszczus
- backing to _rel
================================================================
Index: SPECS/horde-ulaform.spec
diff -u SPECS/horde-ulaform.spec:1.8 SPECS/horde-ulaform.spec:1.9
--- SPECS/horde-ulaform.spec:1.8 Fri Dec 2 18:57:44 2005
+++ SPECS/horde-ulaform.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp ulaform
%define _snap 2005-09-17
#define _rc rc1
-%define _rel 0.9
+%define _rel 0.14
#
%include /usr/lib/rpm/macros.php
Summary: A form generation/processing tool
@@ -17,7 +17,7 @@
Source1: %{name}.conf
URL: http://www.horde.org/ulaform/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -133,7 +133,7 @@
%triggerun -- apache >= 2.0.0
%apache_config_uninstall -v 2
-%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050917.0.5
+%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20050917.0.5, %{_hordeapp}
for i in conf.php fields.php menu.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -151,16 +151,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -189,6 +185,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.9 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.8 2005/12/02 17:57:44 glen
- proper build macros
================================================================
Index: SPECS/horde-whups.spec
diff -u SPECS/horde-whups.spec:1.18 SPECS/horde-whups.spec:1.19
--- SPECS/horde-whups.spec:1.18 Fri Dec 2 18:57:44 2005
+++ SPECS/horde-whups.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp whups
%define _snap 2005-09-17
#define _rc rc1
-%define _rel 0.5
+%define _rel 0.11
#
%include /usr/lib/rpm/macros.php
Summary: The Web Horde User Problem Solver
@@ -17,7 +17,7 @@
Source1: %{_hordeapp}.conf
URL: http://www.horde.org/whups/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
Requires: horde >= 3.0
@@ -112,7 +112,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 1.0-0.20050917.0.3
+%triggerpostun -- horde-%{_hordeapp} < 1.0-0.20050917.0.3, %{_hordeapp}
for i in conf.php menu.php mime_drivers.php prefs.php reminders.php templates.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -130,16 +130,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.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-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register httpd %{_webapp}
rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd reload 1>&2
- fi
+ %service -q httpd reload
fi
%files
@@ -169,6 +165,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2006/01/08 20:28:27 glen
+- use %service in triggers
+- trigger also on old package name
+
Revision 1.18 2005/12/02 17:57:44 glen
- proper build macros
================================================================
Index: SPECS/horde-wicked.spec
diff -u SPECS/horde-wicked.spec:1.15 SPECS/horde-wicked.spec:1.16
--- SPECS/horde-wicked.spec:1.15 Fri Dec 2 18:57:44 2005
+++ SPECS/horde-wicked.spec Sun Jan 8 21:28:27 2006
@@ -2,7 +2,7 @@
%define _hordeapp wicked
%define _snap 2005-11-16
#define _rc rc1
-%define _rel 0.6
+%define _rel 0.11
#
%include /usr/lib/rpm/macros.php
Summary: The Web Horde User Problem Solver
@@ -17,7 +17,7 @@
Source1: %{_hordeapp}.conf
URL: http://www.horde.org/wicked/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
-BuildRequires: rpmbuild(macros) >= 1.264
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires: apache(mod_access)
# actually it requires horde 3.1, but 3.0 is fine for testing too.
@@ -111,7 +111,7 @@
%triggerun -- apache >= 2.0.0
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20051116.0.4
+%triggerpostun -- horde-%{_hordeapp} < 0.1-0.20051116.0.4, %{_hordeapp}
for i in conf.php menu.php prefs.php; do
if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
mv -f %{_sysconfdir}/$i{,.rpmnew}
@@ -129,16 +129,12 @@
if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
/usr/sbin/webapp register apache %{_webapp}
rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.conf
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache reload 1>&2
- fi
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.13&r2=1.14&f=u
http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.36&r2=1.37&f=u
http://cvs.pld-linux.org/SPECS/horde-mimp.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.16&r2=1.17&f=u
http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/SPECS/horde-trean.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.63&r2=1.64&f=u
http://cvs.pld-linux.org/SPECS/horde-ulaform.spec?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/SPECS/horde-wicked.spec?r1=1.15&r2=1.16&f=u
More information about the pld-cvs-commit
mailing list