From b7aa0f9d8a4317729d2d74c3c7bc7abbf53ea6eb Mon Sep 17 00:00:00 2001
From: jorton <jorton@fedoraproject.org>
Date: Mon, 12 Mar 2007 13:29:57 +0000
Subject: [PATCH] - update to 2.2.4 - drop the migration guide (#223605)

---
 .cvsignore             |  2 +-
 httpd-2.2.4.tar.gz.asc | 11 +++++++++++
 httpd.spec             | 25 ++++++-------------------
 sources                |  2 +-
 upstream               |  2 +-
 5 files changed, 20 insertions(+), 22 deletions(-)
 create mode 100644 httpd-2.2.4.tar.gz.asc

diff --git a/.cvsignore b/.cvsignore
index 5bb3dd3..532539e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-httpd-2.2.3.tar.gz
+httpd-2.2.4.tar.gz
diff --git a/httpd-2.2.4.tar.gz.asc b/httpd-2.2.4.tar.gz.asc
new file mode 100644
index 0000000..3895c56
--- /dev/null
+++ b/httpd-2.2.4.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iQEVAwUARZ9GcfcTqHkQ/eB1AQIqcAf8C1wN52hQIHEVIIdRfXqRwJ8sLgmO1b37
+Jsvi3c+WSUxHnlk9/JeHgOHCtKxb9XJd+FU563bbtjyiE4afcw2sP9lZOlN9xlt8
+dFVa9Jqiv+mgasXmUJ4vYRTti3LG5B48W+lrl/F74mmdFDS5mq+VaGdsTGcap3/4
+voqwRvF35A124oR+RPtLZXZSjkM3TxOJT4kCKI7EPudk57zMOZMk6EZZCeu631dM
+eiAXaWXMtcI3Y7JsjnP5k/Pezc6itDsyRBYR2Q/VLq27vZFOwbRqEN0E1/HOCvE4
+M6IqPmvEfm1kB0BZ2j2uz97rSF6bJMS/edXkXeGZrNaw2ldFqdxaPQ==
+=vkJ/
+-----END PGP SIGNATURE-----
diff --git a/httpd.spec b/httpd.spec
index d1e3438..f8549d6 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,8 +6,8 @@
 
 Summary: Apache HTTP Server
 Name: httpd
-Version: 2.2.3
-Release: 8
+Version: 2.2.4
+Release: 2
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -21,9 +21,6 @@ Source12: welcome.conf
 Source13: manual.conf
 Source14: proxy_ajp.conf
 # Documentation
-Source30: migration.xml
-Source31: migration.css
-Source32: html.xsl
 Source33: README.confd
 # build/scripts patches
 Patch1: httpd-2.1.10-apctl.patch
@@ -31,7 +28,6 @@ Patch2: httpd-2.1.10-apxs.patch
 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 +36,6 @@ Patch23: httpd-2.0.45-export.patch
 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
@@ -111,7 +106,6 @@ Security (TLS) protocols.
 %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 +113,6 @@ Security (TLS) protocols.
 %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
@@ -149,14 +141,6 @@ echo '1,/Changes with Apache MPM/wq' | ed CHANGES
 # Before configure; fix location of build dir in generated apxs
 %{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
 	support/apxs.in
-# update location of migration guide in apachectl
-%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
-	support/apachectl.in
-
-# Build the migration guide
-sed 's/@DISTRO@/%{distro}/' < $RPM_SOURCE_DIR/migration.xml > migration.xml
-xmlto -x $RPM_SOURCE_DIR/html.xsl html-nochunks migration.xml
-cp $RPM_SOURCE_DIR/migration.css . # make %%doc happy
 
 CFLAGS=$RPM_OPT_FLAGS
 SH_LDFLAGS="-Wl,-z,relro"
@@ -415,7 +399,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 
 %doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
-%doc migration.html migration.css
 
 %dir %{_sysconfdir}/httpd
 %{_sysconfdir}/httpd/modules
@@ -489,6 +472,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Mon Mar 12 2007 Joe Orton <jorton@redhat.com> 2.2.4-2
+- update to 2.2.4
+- drop the migration guide (#223605)
+
 * Thu Dec  7 2006 Joe Orton <jorton@redhat.com> 2.2.3-8
 - fix path to instdso.sh in special.mk (#217677)
 - fix detection of links in "apachectl fullstatus"
diff --git a/sources b/sources
index 8cc0213..b49ed77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f72ffb176e2dc7b322be16508c09f63c  httpd-2.2.3.tar.gz
+3add41e0b924d4bb53c2dee55a38c09e  httpd-2.2.4.tar.gz
diff --git a/upstream b/upstream
index 5bb3dd3..532539e 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-httpd-2.2.3.tar.gz
+httpd-2.2.4.tar.gz