-%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 fcgid
+%define apxs /usr/sbin/apxs
Summary: A binary compatibility alternative to Apache module mod_fastcgi
Summary(pl): Binarnie kompatybilna alternatywa dla modu³u Apache'a mod_fastcgi
-Name: apache-mod_fcgid
-Version: 0.74
-Release: 1
-License: distributable
+Name: apache-mod_%{mod_name}
+Version: 1.03
+Release: 2
+License: GPL v2
Group: Networking/Daemons
-Source0: http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
-# Source0-md5: 50c625f238c82cba3ed232cec3d3ca95
-Source1: 70_mod_fcgid.conf
+Source0: http://fastcgi.coremail.cn/mod_%{mod_name}.%{version}.tar.gz
+# Source0-md5: dbcd5c96f8d6c6fcb7471abf527d176f
+Source1: %{name}.conf
+Patch0: %{name}-apr-status-is-success.patch
URL: http://fastcgi.coremail.cn/
BuildRequires: %{apxs}
-BuildRequires: apache-devel
+BuildRequires: apache-devel >= 2.0.52-2
BuildRequires: libtool
BuildRequires: sed >= 4.0
-Requires(post,preun): %{apxs}
-Requires: apache >= 1.3.1
+Requires: apache(modules-api) = %apache_modules_api
+Requires: apache >= 2.0.52-2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _libexecdir %{_libdir}/apache
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
A binary compatibility alternative to Apache module mod_fastcgi.
fastcgi najszybciej jak to mo¿liwe.
%prep
-%setup -q -n mod_fcgid.%{version}
+%setup -q -n mod_%{mod_name}.%{version}
+%patch0 -p1
%build
-sed -i -e 's#top_dir.*=.*#top_dir = %{_libexecdir}#g' Makefile
-echo "INCLUDES=`apr-config --includes` `apu-config --includes` -I%{_includedir}/apache" >> Makefile
-%{__make}
+%{__make} \
+ top_dir=%{_pkglibdir} \
+ APXS=%{_apxs} \
+ INCLUDES="-I%(%{apxs} -q INCLUDEDIR)"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libexecdir},%{_htmldocdir}}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
-libtool --mode=install install mod_fcgid.la $RPM_BUILD_ROOT%{_libexecdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/httpd.conf/70_mod_fcgid.conf
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
%post
if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
-else
- echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+ /etc/rc.d/init.d/httpd restart 1>&2
fi
%preun
if [ "$1" = "0" ]; then
- 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 AUTHOR ChangeLog
-%attr(755,root,root) %{_libexecdir}/*.so
+%config(noreplace) /etc/httpd/httpd.conf/70_mod_fcgid.conf
+%attr(755,root,root) %{_pkglibdir}/*.so