- apr1 patch uneeded

- unify with apache 1.3 package

Changed files:
    apache-mod_fastcgi.spec -> 1.60

diff --git a/apache-mod_fastcgi.spec b/apache-mod_fastcgi.spec
index 63d87609bf7f0070c39105b9117c300b123cd8db..25944b7b230cb18fde0ccfee53b7ca2c6d3c520d 100644 (file)
--- a/apache-mod_fastcgi.spec
+++ b/apache-mod_fastcgi.spec
@@ -10,15 +10,15 @@ Version:    2.4.6
 Release:       5
 License:       distributable
 Group:         Networking/Daemons
-Source0:       http://www.FastCGI.com/dist/mod_%{mod_name}-%{version}.tar.gz
+Source0:       http://www.fastcgi.com/dist/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: a21a613dd5dacf4c8ad88c8550294fed
 Patch0:                %{name}-allow-uid-gid.patch
 Patch1:                %{name}-socketdir.patch
+Patch2:                %{name}-stderr-buf.patch
 Patch3:                %{name}-segv-onload.patch
-Patch4:                %{name}-apr1.patch
-Patch5:                %{name}-apache22.patch
+Patch4:                %{name}-apache22.patch
 Source1:       %{name}.conf
-URL:           http://www.FastCGI.com/
+URL:           http://www.fastcgi.com/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.2
 BuildRequires: libtool
@@ -26,8 +26,8 @@ BuildRequires:        rpmbuild(macros) >= 1.268
 Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
-%define                apachelibdir    %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _socketdir      /var/run/httpd/fastcgi
 
 %description
@@ -59,22 +59,22 @@ FastCGI - розширення CGI, яке надає можливість ст
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 %{__make} -f Makefile.AP2 \
-       top_dir=%{apachelibdir} \
+       top_dir=%{_pkglibdir} \
        INCLUDES="-I%(%{apxs} -q INCLUDEDIR)" \
        EXTRA_CFLAGS='-DAPACHE22'
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_socketdir}/dynamic}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},%{_socketdir}/dynamic}
 
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,7 +90,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc docs/LICENSE.TERMS CHANGES docs/*.html
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{apachelibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %dir %attr(770,root,http) %{_socketdir}
 %dir %attr(770,root,http) %{_socketdir}/dynamic