Author: glen Date: Sun Jul 10 13:41:58 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use %service macro for restaring apache service - now it's possible to disable automatic massive restarts
---- Files affected: SPECS: apache1.spec (1.101 -> 1.102) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.101 SPECS/apache1.spec:1.102 --- SPECS/apache1.spec:1.101 Sun Jul 10 11:24:53 2005 +++ SPECS/apache1.spec Sun Jul 10 15:41:53 2005 @@ -31,7 +31,7 @@ Summary(zh_CN): Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ Name: apache1 Version: 1.3.33 -Release: 6.9 +Release: 6.17 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz @@ -88,7 +88,7 @@ BuildRequires: db-devel >= 4.1 BuildRequires: mm-devel >= 1.3.0 %{?with_rewrite_ldap:BuildRequires: openldap-devel} -BuildRequires: rpmbuild(macros) >= 1.202 +BuildRequires: rpmbuild(macros) >= 1.228 BuildRequires: rpm-perlprov PreReq: mm PreReq: perl-base @@ -1412,11 +1412,7 @@ /sbin/chkconfig --add apache umask 137 touch /var/log/apache/{access,error,agent,referer}_log -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 apache restart %preun if [ "$1" = "0" ]; then @@ -1488,146 +1484,86 @@ fi %post errordocs -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 apache restart %postun errordocs 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 %post mod_access -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 apache restart %postun mod_access 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 %post mod_actions -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 apache restart %postun mod_actions 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 %post mod_alias -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 apache restart %postun mod_alias 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 %post mod_asis -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 apache restart %postun mod_asis 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 %post mod_auth -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 apache restart %postun mod_auth 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 %post mod_auth_anon -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 apache restart %postun mod_auth_anon 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 %post mod_auth_db -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 apache restart %postun mod_auth_db 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 mod_auth_db -- apache-mod_auth_db <= 1.3.20-2 %{apxs} -e -A -n auth_dbm %{_libexecdir}/mod_auth_dbm.so 1>&2 %post mod_auth_digest -if [ "$1" = "0" ]; then - 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 -fi +%service apache restart %postun mod_auth_digest 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 %post mod_autoindex -if [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi +%service apache restart %postun mod_autoindex 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 mod_autoindex -- apache1-mod_autoindex < 1.3.33-1.85 @@ -1637,283 +1573,163 @@ ' /etc/apache/apache.conf %post mod_cern_meta -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 apache restart %postun mod_cern_meta 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 %post mod_cgi -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 apache restart %postun mod_cgi 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 %post mod_define -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 apache restart %postun mod_define 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 %post mod_digest -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 apache restart %postun mod_digest 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 %post mod_dir -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 apache restart %postun mod_dir 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 %post mod_env -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 apache restart %postun mod_env 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 %post mod_expires -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 apache restart %postun mod_expires 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 %post mod_headers -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 apache restart %postun mod_headers 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 %post mod_imap -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 apache restart %postun mod_imap 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 %post mod_include -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 apache restart %postun mod_include 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 %post mod_info -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 apache restart %postun mod_info 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 %post mod_log_agent -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 apache restart %postun mod_log_agent 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 %post mod_log_config -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 apache restart %postun mod_log_config 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 %post mod_log_forensic -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 apache restart %postun mod_log_forensic 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 %post mod_log_referer -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 apache restart %postun mod_log_referer 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 %post mod_mime -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 apache restart %postun mod_mime 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 %post mod_mime_magic -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 apache restart %postun mod_mime_magic 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 %post mod_mmap_static -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 apache restart %postun mod_mmap_static 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 %post mod_negotiation -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 apache restart %postun mod_negotiation 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 %post mod_proxy -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 apache restart %postun mod_proxy 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 mod_proxy -- apache1-mod_proxy < 1.3.33-1.85 @@ -1923,59 +1739,35 @@ ' /etc/apache/apache.conf %post mod_rewrite -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 apache restart %postun mod_rewrite 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 %post mod_setenvif -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 apache restart %postun mod_setenvif 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 %post mod_speling -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 apache restart %postun mod_speling 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 %post mod_status -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 apache restart %postun mod_status 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 mod_status -- apache1-mod_status < 1.3.33-1.85 @@ -1985,59 +1777,35 @@ ' /etc/apache/apache.conf <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.101&r2=1.102&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
