-%define apxs /usr/sbin/apxs
-%define _apache1 %(rpm -q apache-devel 2> /dev/null | grep -Eq '\\-2\\.[0-9]+\\.' && echo 0 || echo 1)
+%define mod_name fastcgi
+%define apxs /usr/sbin/apxs
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
+Name: apache-mod_%{mod_name}
+# NOTE: remember about apache1-mod_fastcgi.spec when messing here
Version: 2.4.2
-Release: 2
+Release: 4
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_fastcgi.conf
+Patch0: %{name}-apr1.patch
+Patch1: %{name}-allow-uid-gid.patch
+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 _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.
û×ÉÄ˦ÓÔØ API web-ÓÅÒ×ÅÒ¦× Ú¦ ×Ó¦ÍÁ ÐÅÒÅ×ÁÇÁÍÉ CGI.
%prep
-%setup -q -n mod_fastcgi-%{version}
+%setup -q -n mod_%{mod_name}-%{version}
%patch0 -p1
+%patch1 -p1
%build
-%if %{_apache1}
-%{apxs} -o mod_fastcgi.so -c *.c
-%else
-%{__make} -f Makefile.AP2 top_dir=%{_libexecdir} INCLUDES="-I%{_includedir}/apache"
-%endif
+%{__make} -f Makefile.AP2 \
+ top_dir=%{_pkglibdir} \
+ INCLUDES="-I%(%{apxs} -q INCLUDEDIR)"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libexecdir},%{_htmldocdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
-%if %{_apache1}
-install mod_fastcgi.so $RPM_BUILD_ROOT%{_libexecdir}
-%else
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
-libtool --mode=install install mod_fastcgi.la $RPM_BUILD_ROOT%{_libexecdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/httpd.conf/
-%endif
-
-install docs/*.html $RPM_BUILD_ROOT%{_htmldocdir}
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
%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."
+ echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
fi
%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}/*
-%attr(755,root,root) %{_libexecdir}/*.so
-%if ! %{_apache1}
-%config %{_sysconfdir}/httpd/httpd.conf/*.conf
-%endif
+%doc docs/LICENSE.TERMS CHANGES docs/*.html
+%attr(755,root,root) %{_pkglibdir}/*.so
+%config %{_sysconfdir}/httpd.conf/*.conf