From c94ce804637a20661d5914dc2a9b5bcb6b079388 Mon Sep 17 00:00:00 2001
From: radek <radek@pld-linux.org>
Date: Sat, 25 Sep 2004 09:09:25 +0000
Subject: [PATCH] - release 3: finished unifications, dropped apache1 bcond
 (->apache1-*.spec)

Changed files:
    apache-mod_fastcgi.spec -> 1.35
---
 apache-mod_fastcgi.spec | 51 ++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/apache-mod_fastcgi.spec b/apache-mod_fastcgi.spec
index 733bd55..37ddaf7 100644
--- a/apache-mod_fastcgi.spec
+++ b/apache-mod_fastcgi.spec
@@ -1,30 +1,28 @@
 %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_%{mod_name}
 Version:	2.4.2
-Release:	2
+Release:	3
 License:	distributable
 Group:		Networking/Daemons
 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
+Source1:	%{name}.conf
 URL:		http://www.FastCGI.com/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
+BuildRequires:	apache-devel >= 2
 BuildRequires:	libtool
 Requires(post,preun):	%{apxs}
-Requires:	apache >= 1.3.1
+Requires:	apache >= 2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %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.
@@ -56,54 +54,35 @@ FastCGI - 
 %patch0 -p1
 
 %build
-%if %{_apache1}
-%{apxs} -o mod_%{mod_name}.so -c *.c
-%else
-%{__make} -f Makefile.AP2 top_dir=%{_pkglibdir} INCLUDES="-I%(%{apxs} -q INCLUDEDIR)"
-%endif
+%{__make} -f Makefile.AP2 \
+	top_dir=%{_pkglibdir} \
+	INCLUDES="-I%(%{apxs} -q INCLUDEDIR)"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_htmldocdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
-%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 .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
-%endif
-
-install docs/*.html $RPM_BUILD_ROOT%{_htmldocdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%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."
-fi
+	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
  
 %preun
 if [ "$1" = "0" ]; then
-%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
+	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}/*
+%doc docs/LICENSE.TERMS CHANGES docs/*.html
 %attr(755,root,root) %{_pkglibdir}/*.so
-%if ! %{_apache1}
 %config %{_sysconfdir}/httpd.conf/*.conf
-%endif
-- 
2.44.0