rpms/httpd/devel httpd.spec,1.72,1.73
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jul 28 14:52:12 UTC 2005
- Previous message (by thread): rpms/glibc/FC-4 glibc-20050524-20050727.patch, 1.1, 1.2 glibc.spec, 1.158, 1.159
- Next message (by thread): rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.31, 1.32 java-1.4.2-gcj-compat.spec, 1.95, 1.96 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jorton
Update of /cvs/dist/rpms/httpd/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25436
Modified Files:
httpd.spec
Log Message:
* Thu Jul 28 2005 Joe Orton <jorton at redhat.com> 2.0.54-12
- drop broken epoch deps
Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- httpd.spec 26 Jul 2005 12:08:18 -0000 1.72
+++ httpd.spec 28 Jul 2005 14:52:09 -0000 1.73
@@ -7,7 +7,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.0.54
-Release: 11
+Release: 12
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -95,7 +95,7 @@
Summary: Development tools for the Apache HTTP server.
Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
Requires: apr-devel, apr-util-devel, pcre-devel >= 0:5.0
-Requires: httpd = %{epoch}:%{version}-%{release}
+Requires: httpd = %{version}-%{release}
%description devel
The httpd-devel package contains the APXS binary and other files
@@ -109,7 +109,7 @@
%package manual
Group: Documentation
Summary: Documentation for the Apache HTTP server.
-Requires: httpd = %{epoch}:%{version}-%{release}
+Requires: httpd = %{version}-%{release}
Obsoletes: secureweb-manual, apache-manual
%description manual
@@ -123,7 +123,7 @@
Epoch: 1
BuildRequires: openssl-devel, distcache-devel
Requires(post): openssl >= 0.9.7f-4, /bin/cat
-Requires: httpd = %{epoch}:%{version}-%{release}, httpd-mmn = %{mmn}
+Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
Obsoletes: stronghold-mod_ssl
%description -n mod_ssl
@@ -181,9 +181,6 @@
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
-# Touch mod_ssl expression parser sources to prevent regenerating it
-touch modules/ssl/ssl_expr_*.[chyl]
-
# Safety check: prevent build if defined MMN does not equal upstream MMN.
vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
if test "x${vmmn}" != "x%{mmn}"; then
@@ -192,7 +189,6 @@
exit 1
fi
-
: Building for '%{distro}' with MMN %{mmn} and vendor string '%{vstring}'
%build
@@ -547,6 +543,9 @@
%{_libdir}/httpd/build/libtool
%changelog
+* Thu Jul 28 2005 Joe Orton <jorton at redhat.com> 2.0.54-12
+- drop broken epoch deps
+
* Thu Jun 30 2005 Joe Orton <jorton at redhat.com> 2.0.54-11
- mod_dav_fs: fix uninitialized variable (#162144)
- add epoch to dependencies as appropriate
- Previous message (by thread): rpms/glibc/FC-4 glibc-20050524-20050727.patch, 1.1, 1.2 glibc.spec, 1.158, 1.159
- Next message (by thread): rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.31, 1.32 java-1.4.2-gcj-compat.spec, 1.95, 1.96 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list