[packages/apache-mod_suphp] - fix for building with apache-2.4 - added patch to build with automake >= 1.13 - rel. 4

[kiesiu]

commit 8b342dffed00c0230511dbdd44672d453fc131e4
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date:   Fri Apr 12 19:36:16 2013 +0200

    - fix for building with apache-2.4
    - added patch to build with automake >= 1.13
    - rel. 4

 apache-mod_suphp-apache_version.patch | 19 ++++++++++++-------
 apache-mod_suphp.spec                 |  4 +++-
 automake-1.13.patch                   | 12 ++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/apache-mod_suphp.spec b/apache-mod_suphp.spec
index b57d692..612f132 100644
--- a/apache-mod_suphp.spec
+++ b/apache-mod_suphp.spec
@@ -8,7 +8,7 @@ Summary:	Apache module: suPHP - execute PHP scripts with the permissions of thei
 Summary(pl.UTF-8):	Moduł do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich właścicieli
 Name:		apache-mod_%{mod_name}
 Version:	0.7.1
-Release:	3
+Release:	4
 License:	GPL
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
@@ -18,6 +18,7 @@ Source2:	%{name}.conf
 Source3:	%{name}-suphp.conf
 Patch0:		%{name}-compiler-flags.patch
 Patch1:		%{name}-apache_version.patch
+Patch2:		automake-1.13.patch
 URL:		http://www.suphp.org/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.52-2
@@ -50,6 +51,7 @@ moduł w celu zmiany uid procesu uruchamiającego interpreter PHP.
 %setup -q -n %{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/apache-mod_suphp-apache_version.patch b/apache-mod_suphp-apache_version.patch
index b88c0f6..68c26df 100644
--- a/apache-mod_suphp-apache_version.patch
+++ b/apache-mod_suphp-apache_version.patch
@@ -1,16 +1,21 @@
---- x/configure.ac~	2006-11-19 13:52:30.000000000 +0000
-+++ x/configure.ac	2007-09-17 14:38:43.000000000 +0000
-@@ -60,11 +60,13 @@
+diff -uNr suphp-0.7.1.old/configure.ac suphp-0.7.1/configure.ac
+--- suphp-0.7.1.old/configure.ac	2009-03-14 18:58:11.000000000 +0100
++++ suphp-0.7.1/configure.ac	2013-04-12 19:04:01.484478525 +0200
+@@ -59,14 +59,15 @@
+ 
  if test -n "$APXS"; then
      AC_SUBST(APXS)
-     
-+	if test -z "$APACHE_VERSION"; then
+-    
++    if test -z "$APACHE_VERSION"; then
      APACHE_VERSION=`\`$APXS -q SBINDIR\`/\`$APXS -q TARGET\` -v \
                      | grep "Server version" \
                      | cut -f2 -d":" \
                      | cut -f2 -d"/" \
                      | cut -f1 -d" "`
-+	fi
++    fi
      major_version=`echo $APACHE_VERSION|cut -f1,2 -d.`
-     if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then
+-    if test "$major_version" = "2.0" -o "$major_version" = "2.2"; then
++    if test "$major_version" = "2.0" -o "$major_version" = "2.2" -o "$major_version" = "2.4"; then
        APACHE_VERSION_2=true
+       APACHE_VERSION_1_3=false
+     else
diff --git a/automake-1.13.patch b/automake-1.13.patch
new file mode 100644
index 0000000..2128ee9
--- /dev/null
+++ b/automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -uNr suphp-0.7.1.old/configure.ac suphp-0.7.1/configure.ac
+--- suphp-0.7.1.old/configure.ac	2009-03-14 18:58:11.000000000 +0100
++++ suphp-0.7.1/configure.ac	2013-04-12 15:26:34.102119142 +0200
+@@ -10,7 +10,7 @@
+ # Check for right directory
+ AC_CONFIG_SRCDIR([src/Application.cpp])
+ # Config headers for automake
+-AM_CONFIG_HEADER([src/config.h])
++AC_CONFIG_HEADERS([src/config.h])
+ 
+ # Build time sanity check
+ AM_SANITY_CHECK
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_suphp.git/commitdiff/8b342dffed00c0230511dbdd44672d453fc131e4