Author: glen Date: Fri Apr 14 17:03:31 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service
---- Files affected: SPECS: apache1-mod_msff.spec (1.13 -> 1.14) , apache1-mod_ntlm.spec (1.21 -> 1.22) , apache1-mod_ometer.spec (1.17 -> 1.18) , apache1-mod_perl.spec (1.33 -> 1.34) , apache1-mod_roaming.spec (1.27 -> 1.28) , apache1-mod_security.spec (1.8 -> 1.9) , apache1-mod_snake.spec (1.20 -> 1.21) , apache1-mod_sqlinclude.spec (1.22 -> 1.23) , apache1-mod_suid.spec (1.12 -> 1.13) , apache1-mod_suphp.spec (1.5 -> 1.6) ---- Diffs: ================================================================ Index: SPECS/apache1-mod_msff.spec diff -u SPECS/apache1-mod_msff.spec:1.13 SPECS/apache1-mod_msff.spec:1.14 --- SPECS/apache1-mod_msff.spec:1.13 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_msff.spec Fri Apr 14 19:03:25 2006 @@ -13,8 +13,9 @@ URL: http://davenet.userland.com/2001/06/13 BuildRequires: %{apxs} BuildRequires: apache1-devel >= 1.3.33-2 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: apache1 >= 1.3.33-2 -Obsoletes: apache-mod_%{mod_name} <= 0.1 +Obsoletes: apache-mod_msff <= 0.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -23,7 +24,7 @@ %description mod_msff.c: Microsoft Free Fridays: reject MSIE on Friday. -More info: http://davenet.userland.com/2001/06/13 +More info: <http://davenet.userland.com/2001/06/13> %description -l pl Moduł do serwera Apache zabraniający w piątki dostępu do serwera @@ -31,7 +32,7 @@ realizacji Wolnych Piątków (czyli dni luźniejszych, w których _nawet_ można przyjść do pracy w dżinsach :-))))). -Więcej informacji: http://davenet.userland.com/2001/06/13 +Więcej informacji: <http://davenet.userland.com/2001/06/13> %prep %setup -q -T -c @@ -53,15 +54,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %files @@ -75,6 +72,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2006/04/14 17:03:25 glen +- use %service + Revision 1.13 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_ntlm.spec diff -u SPECS/apache1-mod_ntlm.spec:1.21 SPECS/apache1-mod_ntlm.spec:1.22 --- SPECS/apache1-mod_ntlm.spec:1.21 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_ntlm.spec Fri Apr 14 19:03:25 2006 @@ -16,8 +16,9 @@ URL: http://modntlm.sourceforge.net/ BuildRequires: %{apxs} BuildRequires: apache1-devel >= 1.3.33-2 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: apache1 >= 1.3.33-2 -Obsoletes: apache-mod_%{mod_name} <= 1:0.4 +Obsoletes: apache-mod_ntlm <= 1:0.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -53,15 +54,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %files @@ -75,6 +72,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2006/04/14 17:03:25 glen +- use %service + Revision 1.21 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_ometer.spec diff -u SPECS/apache1-mod_ometer.spec:1.17 SPECS/apache1-mod_ometer.spec:1.18 --- SPECS/apache1-mod_ometer.spec:1.17 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_ometer.spec Fri Apr 14 19:03:25 2006 @@ -22,8 +22,9 @@ BuildRequires: apache1-devel >= 1.3.33-2 BuildRequires: gd-devel BuildRequires: libjpeg-devel +BuildRequires: rpmbuild(macros) >= 1.268 Requires: apache1 >= 1.3.33-2 -Obsoletes: apache-mod_%{mod_name} <= 1.2.0 +Obsoletes: apache-mod_ometer <= 1.2.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -72,15 +73,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %files @@ -95,6 +92,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2006/04/14 17:03:25 glen +- use %service + Revision 1.17 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_perl.spec diff -u SPECS/apache1-mod_perl.spec:1.33 SPECS/apache1-mod_perl.spec:1.34 --- SPECS/apache1-mod_perl.spec:1.33 Mon Feb 27 15:48:48 2006 +++ SPECS/apache1-mod_perl.spec Fri Apr 14 19:03:25 2006 @@ -50,6 +50,7 @@ BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: perl-libwww BuildRequires: rpm-perlprov >= 4.1-13 +BuildRequires: rpmbuild(macros) >= 1.268 %requires_eq_to apache1 apache1-devel Requires(triggerpostun): sed >= 4.0 Requires: apache1(EAPI) @@ -256,17 +257,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -else - echo "Run \"/etc/rc.d/init.d/apache start\" to start apache HTTP daemon." -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %triggerpostun -- apache1-mod_%{mod_name} < 1.29-7.1 @@ -311,6 +306,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.34 2006/04/14 17:03:25 glen +- use %service + Revision 1.33 2006/02/27 14:48:48 glen - drop P: perl(mod_perl_hooks) ================================================================ Index: SPECS/apache1-mod_roaming.spec diff -u SPECS/apache1-mod_roaming.spec:1.27 SPECS/apache1-mod_roaming.spec:1.28 --- SPECS/apache1-mod_roaming.spec:1.27 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_roaming.spec Fri Apr 14 19:03:25 2006 @@ -27,6 +27,7 @@ URL: http://www.klomp.org/mod_roaming/ BuildRequires: %{apxs} BuildRequires: apache1-devel >= 1.3.33-2 +BuildRequires: rpmbuild(macros) >= 1.268 Requires(triggerpostun): %{apxs} Requires(triggerpostun): grep Requires(triggerpostun): sed >= 4.0 @@ -131,15 +132,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %triggerpostun -- %{name} < 1.0.2-1.1 @@ -154,9 +151,7 @@ s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf, ' /etc/apache/apache.conf fi -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %files %defattr(644,root,root,755) @@ -171,6 +166,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2006/04/14 17:03:25 glen +- use %service + Revision 1.27 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_security.spec diff -u SPECS/apache1-mod_security.spec:1.8 SPECS/apache1-mod_security.spec:1.9 --- SPECS/apache1-mod_security.spec:1.8 Mon Dec 12 14:44:44 2005 +++ SPECS/apache1-mod_security.spec Fri Apr 14 19:03:25 2006 @@ -12,6 +12,7 @@ # Source0-md5: 0dd48656e451c711358c097dc80e0369 URL: http://www.modsecurity.org/ BuildRequires: apache1-devel >= 1.3.33-2 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: apache1 >= 1.3.33-2 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,15 +50,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %files @@ -72,6 +69,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.9 2006/04/14 17:03:25 glen +- use %service + Revision 1.8 2005/12/12 13:44:44 glen - adapterized (sorted %verify attrs) ================================================================ Index: SPECS/apache1-mod_snake.spec diff -u SPECS/apache1-mod_snake.spec:1.20 SPECS/apache1-mod_snake.spec:1.21 --- SPECS/apache1-mod_snake.spec:1.20 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_snake.spec Fri Apr 14 19:03:25 2006 @@ -18,8 +18,9 @@ BuildRequires: %{apxs} BuildRequires: apache1-devel >= 1.3.33-2 BuildRequires: python-devel >= 1.5 +BuildRequires: rpmbuild(macros) >= 1.268 Requires: apache1 >= 1.3.33-2 -Obsoletes: apache-mod_%{mod_name} <= 0.5.0 +Obsoletes: apache-mod_snake <= 0.5.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -62,15 +63,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %files @@ -84,6 +81,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2006/04/14 17:03:25 glen +- use %service + Revision 1.20 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_sqlinclude.spec diff -u SPECS/apache1-mod_sqlinclude.spec:1.22 SPECS/apache1-mod_sqlinclude.spec:1.23 --- SPECS/apache1-mod_sqlinclude.spec:1.22 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_sqlinclude.spec Fri Apr 14 19:03:25 2006 @@ -13,9 +13,10 @@ URL: http://sourceforge.net/projects/mod-sqlinclude/ BuildRequires: apache1-devel >= 1.3.33-2 BuildRequires: mysql-devel +BuildRequires: rpmbuild(macros) >= 1.268 Requires(triggerpostun): %{apxs} Requires: apache1 >= 1.3.33-2 -Obsoletes: apache-mod_%{mod_name} <= 1.4 +Obsoletes: apache-mod_sqlinclude <= 1.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -51,15 +52,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %triggerpostun -- apache1-mod_%{mod_name} < 1.4-1.2 @@ -80,6 +77,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.23 2006/04/14 17:03:25 glen +- use %service + Revision 1.22 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_suid.spec diff -u SPECS/apache1-mod_suid.spec:1.12 SPECS/apache1-mod_suid.spec:1.13 --- SPECS/apache1-mod_suid.spec:1.12 Fri Apr 14 18:54:38 2006 +++ SPECS/apache1-mod_suid.spec Fri Apr 14 19:03:25 2006 @@ -13,10 +13,11 @@ URL: http://www.jdimedia.nl/igmar/mod_suid/ BuildRequires: %{apxs} BuildRequires: apache1-devel >= 1.3.33-2 +BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: zlib-devel Requires(triggerpostun): %{apxs} Requires: apache1 >= 1.3.33-2 -Obsoletes: apache-mod_%{mod_name} <= 1.1 +Obsoletes: apache-mod_suid <= 1.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) @@ -47,15 +48,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %postun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %triggerpostun -- apache1-mod_%{mod_name} < 1.1-1.1 @@ -76,6 +73,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2006/04/14 17:03:25 glen +- use %service + Revision 1.12 2006/04/14 16:54:38 glen - obsoletes with constant version ================================================================ Index: SPECS/apache1-mod_suphp.spec diff -u SPECS/apache1-mod_suphp.spec:1.5 SPECS/apache1-mod_suphp.spec:1.6 --- SPECS/apache1-mod_suphp.spec:1.5 Mon Feb 28 21:28:38 2005 +++ SPECS/apache1-mod_suphp.spec Fri Apr 14 19:03:25 2006 @@ -84,15 +84,11 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service -q apache restart %preun if [ "$1" = "0" ]; then - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi # TODO remove the trigger, if no longer needed @@ -103,9 +99,7 @@ /^Include.*mod_%{mod_name}\.conf/d ' /etc/apache/apache.conf - if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi + %service -q apache restart fi %files @@ -122,6 +116,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.6 2006/04/14 17:03:25 glen +- use %service + Revision 1.5 2005/02/28 20:28:38 adamg - pass --with-php (from Marcin Sztolcman) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1-mod_msff.spec?r1=1.13&r2=1.14&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_ntlm.spec?r1=1.21&r2=1.22&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_ometer.spec?r1=1.17&r2=1.18&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_perl.spec?r1=1.33&r2=1.34&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_roaming.spec?r1=1.27&r2=1.28&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_security.spec?r1=1.8&r2=1.9&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_snake.spec?r1=1.20&r2=1.21&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_sqlinclude.spec?r1=1.22&r2=1.23&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_suid.spec?r1=1.12&r2=1.13&f=u http://cvs.pld-linux.org/SPECS/apache1-mod_suphp.spec?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
