SPECS: apache.spec - fix main config change trigger - fixed stop o...

[glen]

Author: glen                         Date: Thu Dec 22 18:47:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix main config change trigger
- fixed stop of initscript
- rel 3

---- Files affected:
SPECS:
   apache.spec (1.449 -> 1.450) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.449 SPECS/apache.spec:1.450
--- SPECS/apache.spec:1.449	Thu Dec 22 00:05:59 2005
+++ SPECS/apache.spec	Thu Dec 22 19:47:25 2005
@@ -37,7 +37,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.2.0
-Release:	2
+Release:	3
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -74,6 +74,7 @@
 Source29:	%{name}-mod_log_config.conf
 Source30:	%{name}-mod_mime_magic.conf
 Source31:	%{name}-mod_cache.conf
+Patch100:	%{name}-branch.patch
 Patch0:		%{name}-configdir_skip_backups.patch
 Patch1:		%{name}-layout.patch
 Patch2:		%{name}-suexec.patch
@@ -1699,6 +1700,7 @@
 
 %prep
 %setup -q -n httpd-%{version}
+#%patch100 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -2086,7 +2088,7 @@
 	fi
 fi
 
-%triggerpostun base -- %{name}-base < 2.2.0-0.84
+%triggerpostun base -- %{name} < 2.2.0
 # rename monitrc to be service name like other files
 if [ -f /etc/monit/apache.monitrc.rpmsave ]; then
 	mv -f /etc/monit/httpd.monitrc{,.rpmnew}
@@ -2095,8 +2097,19 @@
 
 # change HTTPD_CONF to point to new location. *only* if it's the
 # default config setting
+cp -f /etc/sysconfig/httpd{,.rpmsave}
 sed -i -e '/^HTTPD_CONF="\/etc\/httpd\/httpd.conf"/s,.*,HTTPD_CONF="/etc/httpd/apache.conf",' /etc/sysconfig/httpd
 
+# FIXME what other important things to notify about Apache 2.2
+%banner -e %{name} <<'EOF'
+NB! Apache main config has been changed to /etc/httpd/apache.conf
+
+There has been changed a lot, so many things could be broken.
+Please report bugs to http://bugs.pld-linux.org/ so these could be
+resolved before Apache 2.2 gets moved to Ac-main.
+
+EOF
+
 %posttrans base
 # restore lock which we disabled in pretrans
 mv -f /var/lock/subsys/httpd{.disabled,} 2>/dev/null
@@ -2672,6 +2685,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.450  2005/12/22 18:47:25  glen
+- fix main config change trigger
+- fixed stop of initscript
+- rel 3
+
 Revision 1.449  2005/12/21 23:05:59  glen
 - Provide apache(mod_access) for backward compatability
 - loadmodule and scriptalias separately to resolve cgi_test alias being never seen
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.449&r2=1.450&f=u