summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2007-07-25 17:16:39 +0000
committerjorton <jorton@fedoraproject.org>2007-07-25 17:16:39 +0000
commit935b9586c49f00142b9bcc8208116411e3e9eff9 (patch)
treed27b659970ec75e5726d530b113fcf72bc7e563e /httpd.spec
parent705c217da1336004b1400939b61fec56263ebcbf (diff)
downloadhttpd-935b9586c49f00142b9bcc8208116411e3e9eff9.tar.gz
httpd-935b9586c49f00142b9bcc8208116411e3e9eff9.tar.xz
httpd-935b9586c49f00142b9bcc8208116411e3e9eff9.zip
- spec file cleanups: provide httpd-suexec, mod_dav; don't obsolete mod_jk;httpd-2_2_4-5
drop trailing dots from Summaries - init script add LSB info header, support force-reload (#246944) update description drop 1.3 config check pass $pidfile to daemon and pidfile everywhere
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec18
1 files changed, 14 insertions, 4 deletions
diff --git a/httpd.spec b/httpd.spec
index b9b2d81..ed96959 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,7 +6,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.4
-Release: 4
+Release: 5
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -47,9 +47,10 @@ Obsoletes: httpd-suexec
Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig
Provides: webserver
+Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
Provides: httpd-mmn = %{mmn}
-Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache, stronghold-htdocs
-Obsoletes: mod_put, mod_roaming, mod_jk
+Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
+Obsoletes: stronghold-htdocs, mod_put, mod_roaming
Conflicts: pcre < 4.0
%description
@@ -74,7 +75,7 @@ to install this package.
%package manual
Group: Documentation
-Summary: Documentation for the Apache HTTP server.
+Summary: Documentation for the Apache HTTP server
Requires: httpd = %{version}-%{release}
Obsoletes: secureweb-manual, apache-manual
@@ -461,6 +462,15 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Tue Jul 24 2007 Joe Orton <jorton@redhat.com> 2.2.4-5
+- spec file cleanups: provide httpd-suexec, mod_dav;
+ don't obsolete mod_jk; drop trailing dots from Summaries
+- init script
+ * add LSB info header, support force-reload (#246944)
+ * update description
+ * drop 1.3 config check
+ * pass $pidfile to daemon and pidfile everywhere
+
* Wed May 9 2007 Joe Orton <jorton@redhat.com> 2.2.4-4
- update welcome page branding