X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_fastcgi.git;a=blobdiff_plain;f=apache1-mod_fastcgi.spec;h=733bd55ca80bd10532d489b5517089723bdd7ae1;hp=b4dca719809cf0620a6018ce941aaaf55e6c7185;hb=3f3f0c7f3f66a48435bd983d132056faf3cc52e6;hpb=40e467d9bf5733a78bed9af0c236fa5a378d9de7

diff --git a/apache1-mod_fastcgi.spec b/apache1-mod_fastcgi.spec
index b4dca71..733bd55 100644
--- a/apache1-mod_fastcgi.spec
+++ b/apache1-mod_fastcgi.spec
@@ -1,23 +1,30 @@
-%define 	apxs	/usr/sbin/apxs
+%define		mod_name	fastcgi
+%define 	apxs		/usr/sbin/apxs
+%define		_apache1        %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 0 || echo 1)
 Summary:	Support for the FastCGI protocol for apache webserver
 Summary(pl):	Obs³uga protoko³u FastCGI dla serwera apache
 Summary(ru):	FastCGI - ÂÏÌÅÅ ÂÙÓÔÒÁÑ ×ÅÒÓÉÑ CGI
 Summary(uk):	FastCGI - ¦ÌØÛ Û×ÉÄËÁ ×ÅÒÓ¦Ñ CGI
-Name:		apache-mod_fastcgi
-Version:	2.4.0
-Release:	1
+Name:		apache-mod_%{mod_name}
+Version:	2.4.2
+Release:	2
 License:	distributable
 Group:		Networking/Daemons
-Source0:	http://www.FastCGI.com/dist/mod_fastcgi-%{version}.tar.gz
+Source0:	http://www.FastCGI.com/dist/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5:	e994414304b535cb99e10b7d1cad1d1e
+Patch0:		%{name}-allow-uid-gid.patch
+Source1:	70_mod_%{mod_name}.conf
 URL:		http://www.FastCGI.com/
-BuildRequires:	apache-devel
 BuildRequires:	%{apxs}
+BuildRequires:	apache-devel
+BuildRequires:	libtool
 Requires(post,preun):	%{apxs}
 Requires:	apache >= 1.3.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _libexecdir     %{_libdir}/apache
-%define         _htmldocdir     /home/httpd/manual/mod
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_htmldocdir	/home/httpd/manual/mod
 
 %description
 This 3rd party module provides support for the FastCGI protocol.
@@ -45,16 +52,27 @@ FastCGI - 
 û×ÉÄ˦ÓÔØ API web-ÓÅÒ×ÅÒ¦× Ú¦ ×Ó¦ÍÁ ÐÅÒÅ×ÁÇÁÍÉ CGI.
 
 %prep
-%setup -q -n mod_fastcgi-%{version}
+%setup -q -n mod_%{mod_name}-%{version}
+%patch0 -p1
 
 %build
-%{apxs} -D SUEXEC_BIN="\"\\\"%{_sbindir}/suexec\\\"\"" -o mod_fastcgi.so -c *.c
+%if %{_apache1}
+%{apxs} -o mod_%{mod_name}.so -c *.c
+%else
+%{__make} -f Makefile.AP2 top_dir=%{_pkglibdir} INCLUDES="-I%(%{apxs} -q INCLUDEDIR)"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libexecdir},%{_htmldocdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_htmldocdir}}
 
-install mod_fastcgi.so $RPM_BUILD_ROOT%{_libexecdir}
+%if %{_apache1}
+install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+%else
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+libtool --mode=install install mod_%{mod_name}.la $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
+%endif
 
 install docs/*.html $RPM_BUILD_ROOT%{_htmldocdir}
 
@@ -62,23 +80,30 @@ install docs/*.html $RPM_BUILD_ROOT%{_htmldocdir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n fastcgi %{_libexecdir}/mod_fastcgi.so 1>&2
+%if %{_apache1}
+%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+%endif
 if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
+        /etc/rc.d/init.d/httpd restart 1>&2
 else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+        echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
 fi
-
+ 
 %preun
 if [ "$1" = "0" ]; then
-	%{apxs} -e -A -n fastcgi %{_libexecdir}/mod_fastcgi.so 1>&2
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+%if %{_apache1}
+	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+%endif
+        if [ -f /var/lock/subsys/httpd ]; then
+                /etc/rc.d/init.d/httpd restart 1>&2
+        fi
 fi
-
+ 
 %files
 %defattr(644,root,root,755)
 %doc docs/LICENSE.TERMS CHANGES
 %doc %{_htmldocdir}/*
-%attr(755,root,root) %{_libexecdir}/*
+%attr(755,root,root) %{_pkglibdir}/*.so
+%if ! %{_apache1}
+%config %{_sysconfdir}/httpd.conf/*.conf
+%endif