Changeset 1607 for trunk

Timestamp:

Aug 26, 2010, 9:11:39 PM (14 years ago)

Author:

gdb

Message:

Make httpdmods require scripts-httpd

Our patched mod-vhost-ldap uses an Apache API function
from our custom Apache build.

Location:

trunk/server/fedora/specs

Files:

• httpd.spec.patch (modified) (4 diffs)
• httpdmods.spec (modified) (1 diff)

trunk/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- httpd.spec.orig     2010-04-06 18:26:08.000000000 -0400
-+++ httpd.spec  2010-04-14 04:14:13.000000000 -0400
+--- httpd.spec.orig     2010-08-26 21:00:40.771666965 -0400
++++ httpd.spec  2010-08-26 21:01:56.601668199 -0400
 @@ -7,7 +7,7 @@
  Summary: Apache HTTP Server
@@ -25 +25 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -102,6 +109,7 @@
+@@ -65,6 +73,7 @@
+ Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
+ Requires: apr-devel, apr-util-devel, pkgconfig
+ Requires: httpd = %{version}-%{release}
++Provides: scripts-httpd-devel
+ 
+ %description devel
+ The httpd-devel package contains the APXS binary and other files
+@@ -102,6 +111,7 @@
  Requires(post): openssl >= 0.9.7f-4, /bin/cat
  Requires(pre): httpd
@@ -33 +41 @@
  
  %description -n mod_ssl
-@@ -129,6 +137,13 @@
+@@ -129,6 +139,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -47 +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 +191,12 @@
+@@ -177,10 +194,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \

trunk/server/fedora/specs/httpdmods.spec

@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-BuildRequires: httpd-devel
+BuildRequires: scripts-httpd-devel >= 2.2.15-1.fc11.1.scripts.1606
+Requires: scripts-httpd >= 2.2.15-1.fc11.1.scripts.1606
 %define debug_package %{nil}