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

Timestamp:

Apr 16, 2011, 7:59:42 PM (13 years ago)

Author:

achernya

Message:

Necessary changes to build the Scripts RPMs on Fedora 15:

 * Stop scriptsifying 389-ds-base, as it appears to have Mitch's patch
 * Update krb5.spec.patch for krb5-1.9
 * Update the krb5-kuserok-scripts.patch to work with krb5-1.9 (code
   review requested)
 * Update httpd.spec.patch to apply properly to Fedora's newly
   cleaned-up httpd.spec
 * Bump zephyr to version 3.0.1
 

File:

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

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

@@ -1 +1 @@
 --- httpd.spec.orig     2010-10-27 08:26:15.000000000 -0400
 +++ httpd.spec  2010-11-18 18:20:43.000000000 -0500
-@@ -7,7 +7,7 @@
+@@ -8,7 +8,7 @@
  Summary: Apache HTTP Server
  Name: httpd
  Version: 2.2.17
--Release: 1%{?dist}.1
-+Release: 1%{?dist}.1.scripts.%{scriptsversion}
+-Release: 10%{?dist}.1
++Release: 10%{?dist}.1.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -55,6 +55,14 @@
- Conflicts: pcre < 4.0
- Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
+@@ -54,6 +54,14 @@
+ Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
+ Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
  
 +Provides: scripts-httpd
@@ -25 +25 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -65,6 +73,7 @@
+@@ -64,6 +72,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -33 +33 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -103,6 +112,7 @@
- Requires(post): openssl >= 0.9.7f-4, /bin/cat
+@@ -102,6 +102,7 @@
+ Requires(post): openssl, /bin/cat
  Requires(pre): httpd
- Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
+ Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
 +Provides: scripts-mod_ssl
  Obsoletes: stronghold-mod_ssl
  
  %description -n mod_ssl
-@@ -130,6 +140,13 @@
+@@ -129,6 +139,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -55 +55 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -177,10 +194,12 @@
+@@ -176,10 +193,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \