X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_fastcgi.git;a=blobdiff_plain;f=apache1-mod_fastcgi.spec;h=56e40552ee577edef0171cbfd7b66fafb87c2477;hp=33fc0cfe1b9372d6229056d0d7953080d59f52af;hb=a8313c750d12b4012cb4ec1cf56e80f1c53d21e7;hpb=a5861c9e79abcfe4e26cfc4f114bc05107ae3d58

diff --git a/apache1-mod_fastcgi.spec b/apache1-mod_fastcgi.spec
index 33fc0cf..56e4055 100644
--- a/apache1-mod_fastcgi.spec
+++ b/apache1-mod_fastcgi.spec
@@ -1,23 +1,28 @@
-%define 	apxs	/usr/sbin/apxs
+%define		mod_name	fastcgi
+%define 	apxs		/usr/sbin/apxs1
 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.2.12
+Name:		apache1-mod_%{mod_name}
+# NOTE: remember about apache-mod_fastcgi.spec when messing here
+Version:	2.4.2
 Release:	1
-License:	Open Market
+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:		apache-mod_%{mod_name}-allow-uid-gid.patch
 URL:		http://www.FastCGI.com/
-BuildRequires:	apache-devel
 BuildRequires:	%{apxs}
-Prereq:		%{_sbindir}/apxs
-Requires:	apache >= 1.3.1
+BuildRequires:	apache1-devel >= 1.3.1
+BuildRequires:	libtool
+Requires(post,preun):	%{apxs}
+Requires:	apache1 >= 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)
 
 %description
 This 3rd party module provides support for the FastCGI protocol.
@@ -45,40 +50,38 @@ 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
+%{apxs} -o mod_%{mod_name}.so -c *.c
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libexecdir},%{_htmldocdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},}
 
-install mod_fastcgi.so $RPM_BUILD_ROOT%{_libexecdir}
+install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
-install docs/*.html $RPM_BUILD_ROOT%{_htmldocdir}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-%{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
+%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache 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/apache 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
+%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
 	fi
 fi
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+ 
 %files
 %defattr(644,root,root,755)
-%doc docs/LICENSE.TERMS CHANGES
-%doc %{_htmldocdir}/*
-%attr(755,root,root) %{_libexecdir}/*
+%doc docs/LICENSE.TERMS CHANGES docs/*.html 
+%attr(755,root,root) %{_pkglibdir}/*.so