Changeset 925 for server/fedora/specs/httpd.spec.patch

Timestamp:

Jan 1, 2009, 9:12:56 PM (16 years ago)

Author:

quentin

Message:

Update specfile patches to provide scripts-specific virtual packages that we can depend on

File:

• server/fedora/specs/httpd.spec.patch (modified) (3 diffs)

server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2008-02-19 02:05:36.000000000 -0500
-+++ httpd.spec  2008-05-20 19:39:59.000000000 -0400
-@@ -54,6 +54,10 @@
+--- httpd.spec.orig     2009-01-01 21:06:31.000000000 -0500
++++ httpd.spec  2009-01-01 21:08:14.000000000 -0500
+@@ -54,6 +54,11 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}
  
++Provides: scripts-httpd
 +Patch1000: httpd-suexec-scripts.patch
 +Patch1001: httpd-2.2.x-sni.patch
@@ -12 +13 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -127,6 +131,10 @@
+@@ -100,6 +105,7 @@
+ BuildRequires: openssl-devel, distcache-devel
+ Requires(post): openssl >= 0.9.7f-4, /bin/cat
+ Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
++Provides: scripts-mod_ssl
+ Obsoletes: stronghold-mod_ssl
+ 
+ %description -n mod_ssl
+@@ -127,6 +133,10 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -23 +32 @@
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +183,12 @@
+@@ -175,10 +185,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \