Changeset 1607


Ignore:
Timestamp:
Aug 26, 2010, 9:11:39 PM (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/httpd.spec.patch

    r1602 r1607  
    1 --- httpd.spec.orig     2010-04-06 18:26:08.000000000 -0400
    2 +++ httpd.spec  2010-04-14 04:14:13.000000000 -0400
     1--- httpd.spec.orig     2010-08-26 21:00:40.771666965 -0400
     2+++ httpd.spec  2010-08-26 21:01:56.601668199 -0400
    33@@ -7,7 +7,7 @@
    44 Summary: Apache HTTP Server
     
    2525 The Apache HTTP Server is a powerful, efficient, and extensible
    2626 web server.
    27 @@ -102,6 +109,7 @@
     27@@ -65,6 +73,7 @@
     28 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
     29 Requires: apr-devel, apr-util-devel, pkgconfig
     30 Requires: httpd = %{version}-%{release}
     31+Provides: scripts-httpd-devel
     32 
     33 %description devel
     34 The httpd-devel package contains the APXS binary and other files
     35@@ -102,6 +111,7 @@
    2836 Requires(post): openssl >= 0.9.7f-4, /bin/cat
    2937 Requires(pre): httpd
     
    3341 
    3442 %description -n mod_ssl
    35 @@ -129,6 +137,13 @@
     43@@ -129,6 +139,13 @@
    3644 # Patch in vendor/release string
    3745 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    4755 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    4856 if test "x${vmmn}" != "x%{mmn}"; then
    49 @@ -177,10 +191,12 @@
     57@@ -177,10 +194,12 @@
    5058         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5159        --enable-suexec --with-suexec \
  • trunk/server/fedora/specs/httpdmods.spec

    r1277 r1607  
    99Source: %{name}.tar.gz
    1010BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
    11 BuildRequires: httpd-devel
     11BuildRequires: scripts-httpd-devel >= 2.2.15-1.fc11.1.scripts.1606
     12Requires: scripts-httpd >= 2.2.15-1.fc11.1.scripts.1606
    1213%define debug_package %{nil}
    1314
Note: See TracChangeset for help on using the changeset viewer.