You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2005/10/11 14:26:11 UTC
svn commit: r312864 - /httpd/httpd/branches/2.0.x/build/rpm/httpd.spec.in
Author: minfrin
Date: Tue Oct 11 05:25:56 2005
New Revision: 312864
URL: http://svn.apache.org/viewcvs?rev=312864&view=rev
Log:
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.
Modified:
httpd/httpd/branches/2.0.x/build/rpm/httpd.spec.in
Modified: httpd/httpd/branches/2.0.x/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/build/rpm/httpd.spec.in?rev=312864&r1=312863&r2=312864&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/branches/2.0.x/build/rpm/httpd.spec.in Tue Oct 11 05:25:56 2005
@@ -19,7 +19,7 @@
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 @@
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 @@
# 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 @@
%{_libdir}/httpd/build/instdso.sh
%changelog
+* Tue Oct 11 2005 Graham Leggett <mi...@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 <mi...@apache.org> 2.0.53-dev
- Changed build to use external apr and apr-util