From: Graham Leggett <minfrin@apache.org>
Date: Tue, 11 Oct 2005 12:25:56 +0000 (+0000)
Subject: Rpm packaging fix:
X-Git-Tag: 2.0.56~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b33e5fa825c920ceae055be20e7fbe36f18a5e2;p=thirdparty%2Fapache%2Fhttpd.git

Rpm packaging fix:
- Updated the apr and apr-util dependencies to require at least v0.9.7
- Stop trying to remove *.xml doc files, the httpd build does that already.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@312864 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index edba3d41b9a..26b32fea983 100644
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -19,7 +19,7 @@ Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: apr-devel, apr-util-devel, openldap-devel, db4-devel, expat-devel, findutils, perl, pkgconfig
 BuildPrereq: /usr/bin/apr-config, /usr/bin/apu-config
-Requires: apr >= 0.9.5, apr-util >= 0.9.5, gawk, /usr/share/magic.mime, /usr/bin/find, openldap
+Requires: apr >= 0.9.7, apr-util >= 0.9.7, gawk, /usr/share/magic.mime, /usr/bin/find, openldap
 Prereq: /sbin/chkconfig, /bin/mktemp, /bin/rm, /bin/mv
 Prereq: sh-utils, textutils, /usr/sbin/useradd
 Provides: webserver
@@ -37,7 +37,7 @@ Group: Development/Libraries
 Summary: Development tools for the Apache HTTP server.
 Obsoletes: secureweb-devel, apache-devel
 Requires: libtool, httpd = %{version}
-Requires: apr-devel >= 0.9.5, apr-util-devel >= 0.9.5
+Requires: apr-devel >= 0.9.7, apr-util-devel >= 0.9.7
 
 %description devel
 The httpd-devel package contains the APXS binary and other files
@@ -203,7 +203,6 @@ echo %{mmn} > $RPM_BUILD_ROOT%{_includedir}/httpd/.mmn
 # docroot
 mkdir $RPM_BUILD_ROOT%{contentdir}/html
 rm -r $RPM_BUILD_ROOT%{contentdir}/manual/style
-rm $RPM_BUILD_ROOT%{contentdir}/manual/*/*.xml
 
 # logs
 rmdir $RPM_BUILD_ROOT%{_sysconfdir}/httpd/logs
@@ -369,6 +368,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/httpd/build/instdso.sh
 
 %changelog
+* Tue Oct 11 2005 Graham Leggett <minfrin@apache.org> 2.0.56-dev
+- Updated the apr and apr-util dependencies to require at least v0.9.7
+- Stop trying to remove *.xml doc files, the httpd build does that already.
+
 * Thu Dec 16 2004 Graham Leggett <minfrin@apache.org> 2.0.53-dev
 - Changed build to use external apr and apr-util