diff options
author | jorton <jorton@fedoraproject.org> | 2007-08-21 11:29:20 +0000 |
---|---|---|
committer | jorton <jorton@fedoraproject.org> | 2007-08-21 11:29:20 +0000 |
commit | 073d59143359320e0f049d6005a2126d93f85903 (patch) | |
tree | b40c46d76ab5fb4ff766b2dc4d6a1c3fd0f1c9c0 | |
parent | f642b1a7bd33b8888021621ac517daaae72b81bb (diff) | |
download | httpd-073d59143359320e0f049d6005a2126d93f85903.tar.gz httpd-073d59143359320e0f049d6005a2126d93f85903.tar.xz httpd-073d59143359320e0f049d6005a2126d93f85903.zip |
- fix Licensehttpd-2_2_4-8
- require /etc/mime.types (#249223)
-rw-r--r-- | httpd.spec | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -6,7 +6,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.4 -Release: 7 +Release: 8 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -36,13 +36,13 @@ Patch24: httpd-2.0.48-corelimit.patch Patch25: httpd-2.0.54-selinux.patch # Bug fixes Patch54: httpd-2.2.0-authnoprov.patch -License: Apache Software License +License: ASL 2.0 Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: autoconf, perl, pkgconfig, findutils, ed BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0 -Requires: initscripts >= 8.36 +Requires: initscripts >= 8.36, /etc/mime.types Obsoletes: httpd-suexec Requires(pre): /usr/sbin/useradd Requires(post): chkconfig @@ -288,8 +288,6 @@ ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/etc/httpd/modules mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d install -m755 $RPM_SOURCE_DIR/httpd.init \ $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd -%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \ - $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd # install log rotation stuff mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d @@ -476,6 +474,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/httpd/build/*.sh %changelog +* Tue Aug 21 2007 Joe Orton <jorton@redhat.com> 2.2.4-8 +- fix License +- require /etc/mime.types (#249223) + * Thu Jul 26 2007 Joe Orton <jorton@redhat.com> 2.2.4-7 - drop -tools dependency on httpd (thanks to Matthias Saou) |