rpms/httpd/FC-6 httpd-2.1.10-apctl.patch, 1.1, 1.2 httpd.spec, 1.100, 1.101 sources, 1.14, 1.15 httpd-2.0.45-encode.patch, 1.3, NONE httpd-2.2.2-ac260.patch, 1.1, NONE

Fri Mar 23 10:55:23 UTC 2007

Author: jorton

Update of /cvs/dist/rpms/httpd/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv32031

Modified Files:
	httpd-2.1.10-apctl.patch httpd.spec sources 
Removed Files:
	httpd-2.0.45-encode.patch httpd-2.2.2-ac260.patch 
Log Message:
* Fri Mar 23 2007 Joe Orton <jorton at redhat.com> 2.2.4-1.fc6
- update to 2.2.4
- fix path to special.mk in apxs (#217092)
- fix path to lynx in apachectl


httpd-2.1.10-apctl.patch:
 apachectl.in |   60 +++++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 44 insertions(+), 16 deletions(-)

Index: httpd-2.1.10-apctl.patch
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/httpd-2.1.10-apctl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- httpd-2.1.10-apctl.patch	2 Dec 2005 10:43:00 -0000	1.1
+++ httpd-2.1.10-apctl.patch	23 Mar 2007 10:55:21 -0000	1.2
@@ -24,7 +24,7 @@
  # url given on the command line.  Designed for lynx, however other
  # programs may work.  
 -LYNX="@LYNX_PATH@ -dump"
-+if [ -x "@LYNX_PATH" ]; then
++if [ -x "@LYNX_PATH@" ]; then
 +  LYNX="@LYNX_PATH@ -dump"
 +else
 +  LYNX=none


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/httpd.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- httpd.spec	11 Sep 2006 13:36:30 -0000	1.100
+++ httpd.spec	23 Mar 2007 10:55:21 -0000	1.101
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.3
-Release: 5
+Version: 2.2.4
+Release: 1%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -31,7 +31,6 @@
 Patch3: httpd-2.0.45-deplibs.patch
 Patch4: httpd-2.1.10-disablemods.patch
 Patch5: httpd-2.1.10-layout.patch
-Patch6: httpd-2.2.2-ac260.patch
 # Features/functional changes
 Patch20: httpd-2.0.48-release.patch
 Patch21: httpd-2.0.40-xfsz.patch
@@ -40,7 +39,6 @@
 Patch24: httpd-2.0.48-corelimit.patch
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
-Patch50: httpd-2.0.45-encode.patch
 Patch54: httpd-2.2.0-authnoprov.patch
 License: Apache Software License
 Group: System Environment/Daemons
@@ -51,8 +49,8 @@
 Requires: /etc/mime.types, gawk, /usr/share/magic.mime, /usr/bin/find
 Requires: initscripts >= 8.36
 Obsoletes: httpd-suexec
-Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
-Prereq: sh-utils, textutils, /usr/sbin/useradd
+Requires(pre): /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
+Requires(pre): sh-utils, textutils, /usr/sbin/useradd
 Provides: webserver
 Provides: httpd-mmn = %{mmn}
 Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache, stronghold-htdocs
@@ -111,7 +109,6 @@
 %patch3 -p1 -b .deplibs
 %patch4 -p1 -b .disablemods
 %patch5 -p1 -b .layout
-%patch6 -p1 -b .ac260
 
 %patch21 -p0 -b .xfsz
 %patch22 -p1 -b .pod
@@ -119,8 +116,6 @@
 %patch24 -p1 -b .corelimit
 %patch25 -p1 -b .selinux
 
-# no -b to prevent droplets in install root
-%patch50 -p1
 %patch54 -p1 -b .authnoprov
 
 # Patch in vendor/release string
@@ -162,6 +157,9 @@
 SH_LDFLAGS="-Wl,-z,relro"
 export CFLAGS SH_LDFLAGS
 
+# Hard-code path to links to avoid unnecessary builddep
+export LYNX_PATH=/usr/bin/links
+
 function mpmbuild()
 {
 mpm=$1; shift
@@ -315,6 +313,10 @@
 sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
     $RPM_BUILD_ROOT%{_includedir}/httpd/ap_config_layout.h
 
+# Fix path to instdso in special.mk
+sed -i '/instdso/s,top_srcdir,top_builddir,' \
+    $RPM_BUILD_ROOT%{_libdir}/httpd/build/special.mk
+
 # Remove unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.exp \
       $RPM_BUILD_ROOT/etc/httpd/conf/mime.types \
@@ -482,6 +484,11 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Mar 23 2007 Joe Orton <jorton at redhat.com> 2.2.4-1.fc6
+- update to 2.2.4
+- fix path to special.mk in apxs (#217092)
+- fix path to lynx in apachectl
+
 * Mon Sep 11 2006 Joe Orton <jorton at redhat.com> 2.2.3-5
 - updated "powered by Fedora" logo (#205573, Diana Fong)
 - tweak welcome page wording slightly (#205880)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jul 2006 15:19:20 -0000	1.14
+++ sources	23 Mar 2007 10:55:21 -0000	1.15
@@ -1 +1 @@
-f72ffb176e2dc7b322be16508c09f63c  httpd-2.2.3.tar.gz
+3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz


--- httpd-2.0.45-encode.patch DELETED ---


--- httpd-2.2.2-ac260.patch DELETED ---


