rpms/httpd/devel httpd.spec,1.111,1.112

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864

Modified Files:
	httpd.spec 
Log Message:
* Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2.2.4-8
- fix License
- require /etc/mime.types (#249223)



Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- httpd.spec	26 Jul 2007 14:21:42 -0000	1.111
+++ httpd.spec	21 Aug 2007 11:29:20 -0000	1.112
@@ -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 @@
 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 @@
 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 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Tue Aug 21 2007 Joe Orton <jorton at redhat.com> 2.2.4-8
+- fix License
+- require /etc/mime.types (#249223)
+
 * Thu Jul 26 2007 Joe Orton <jorton at redhat.com> 2.2.4-7
 - drop -tools dependency on httpd (thanks to Matthias Saou)