Changeset 2032 for branches/fc15-dev/server/fedora/specs

Timestamp:

Nov 5, 2011, 9:11:05 PM (13 years ago)

Author:

ezyang

Message:

Add systemd dependencies on remote filesystems/cron to httpd.

File:

• branches/fc15-dev/server/fedora/specs/httpd.spec.patch (modified) (6 diffs)

branches/fc15-dev/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2011-08-19 08:36:24.000000000 -0400
-+++ httpd.spec  2011-08-19 08:37:34.000000000 -0400
+--- httpd.spec.orig     2011-09-13 09:43:36.000000000 -0400
++++ httpd.spec  2011-11-05 20:57:13.910145847 -0400
 @@ -8,7 +8,7 @@
  Summary: Apache HTTP Server
@@ -8 +8 @@
 +Release: 1%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
- Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
+ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -52,6 +52,14 @@
+@@ -54,6 +54,15 @@
  Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
@@ -21 +21 @@
 +Patch1006: httpd-suexec-cloexec.patch
 +Patch1007: httpd-fixup-vhost.patch
++Patch1008: httpd-sysv-deps.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -62,6 +70,7 @@
+@@ -64,6 +73,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -33 +34 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -100,6 +109,7 @@
+@@ -102,6 +112,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -41 +42 @@
  
  %description -n mod_ssl
-@@ -125,6 +135,13 @@
+@@ -110,6 +121,11 @@
+ Security (TLS) protocols.
+ 
+ %prep
++
++# Horrible hack to patch the httpd.init file
++cd $RPM_SOURCE_DIR
++%patch1008 -p1 -b .sysv-deps
++
+ %setup -q
+ %patch1 -p1 -b .apctl
+ %patch2 -p1 -b .apxs
+@@ -128,6 +144,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -55 +68 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -172,10 +189,12 @@
+@@ -175,10 +198,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \