Ignore:
Timestamp:
Nov 22, 2011, 12:45:17 AM (11 years ago)
Author:
achernya
Message:
Merge branches/fc15-dev to trunk
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

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

    r1738 r2066  
    1 --- httpd.spec.orig     2010-10-27 08:26:15.000000000 -0400
    2 +++ httpd.spec  2010-11-18 18:20:43.000000000 -0500
    3 @@ -7,7 +7,7 @@
     1--- httpd.spec.orig     2011-09-13 09:43:36.000000000 -0400
     2+++ httpd.spec  2011-11-05 20:57:13.910145847 -0400
     3@@ -8,7 +8,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.17
    7 -Release: 1%{?dist}.1
    8 +Release: 1%{?dist}.1.scripts.%{scriptsversion}
     6 Version: 2.2.21
     7-Release: 1%{?dist}
     8+Release: 1%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -55,6 +55,14 @@
    13  Conflicts: pcre < 4.0
    14  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
     12@@ -54,6 +54,15 @@
     13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
     14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
    1515 
    16 +Provides: scripts-httpd
     16+Provides: scripts-httpd = %{version}-%{release}
    1717+Patch1000: httpd-suexec-scripts.patch
    1818+Patch1003: httpd-2.2.x-mod_status-security.patch
     
    2121+Patch1006: httpd-suexec-cloexec.patch
    2222+Patch1007: httpd-fixup-vhost.patch
     23+Patch1008: httpd-sysv-deps.patch
    2324+
    2425 %description
    2526 The Apache HTTP Server is a powerful, efficient, and extensible
    2627 web server.
    27 @@ -65,6 +73,7 @@
     28@@ -64,6 +73,7 @@
    2829 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2930 Requires: apr-devel, apr-util-devel, pkgconfig
    3031 Requires: httpd = %{version}-%{release}
    31 +Provides: scripts-httpd-devel
     32+Provides: scripts-httpd-devel = %{version}-%{release}
    3233 
    3334 %description devel
    3435 The httpd-devel package contains the APXS binary and other files
    35 @@ -103,6 +112,7 @@
    36  Requires(post): openssl >= 0.9.7f-4, /bin/cat
     36@@ -102,6 +112,7 @@
     37 Requires(post): openssl, /bin/cat
    3738 Requires(pre): httpd
    38  Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     39 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
    3940+Provides: scripts-mod_ssl
    4041 Obsoletes: stronghold-mod_ssl
    4142 
    4243 %description -n mod_ssl
    43 @@ -130,6 +140,13 @@
     44@@ -110,6 +121,11 @@
     45 Security (TLS) protocols.
     46 
     47 %prep
     48+
     49+# Horrible hack to patch the httpd.init file
     50+cd $RPM_SOURCE_DIR
     51+%patch1008 -p1 -b .sysv-deps
     52+
     53 %setup -q
     54 %patch1 -p1 -b .apctl
     55 %patch2 -p1 -b .apxs
     56@@ -128,6 +144,13 @@
    4457 # Patch in vendor/release string
    4558 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    5568 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5669 if test "x${vmmn}" != "x%{mmn}"; then
    57 @@ -177,10 +194,12 @@
     70@@ -175,10 +198,12 @@
    5871         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    5972        --enable-suexec --with-suexec \
Note: See TracChangeset for help on using the changeset viewer.