- fixed socket dir; rel 7

[packages/apache-mod_fastcgi.git] / apache-mod_fastcgi.spec

diff --git a/apache-mod_fastcgi.spec b/apache-mod_fastcgi.spec
index 37ddaf7a584ea41ad27123831e47c34954fecb46..c60c2b0130d9e29cc0ec6a6c6cddd5c0a418b854 100644 (file)
--- a/apache-mod_fastcgi.spec
+++ b/apache-mod_fastcgi.spec
@@ -5,24 +5,28 @@ Summary(pl):  Obs
 Summary(ru):   FastCGI - ÂÏÌÅÅ ÂÙÓÔÒÁÑ ×ÅÒÓÉÑ CGI
 Summary(uk):   FastCGI - ¦ÌØÛ Û×ÉÄËÁ ×ÅÒÓ¦Ñ CGI
 Name:          apache-mod_%{mod_name}
+# NOTE: remember about apache1-mod_fastcgi.spec when messing here
 Version:       2.4.2
-Release:       3
+Release:       7
 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
+Patch0:                %{name}-apr1.patch
+Patch1:                %{name}-allow-uid-gid.patch
+Patch2:                %{name}-socketdir.patch
 Source1:       %{name}.conf
 URL:           http://www.FastCGI.com/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel >= 2
+BuildRequires: apache-devel >= 2.2
 BuildRequires: libtool
 Requires(post,preun):  %{apxs}
-Requires:      apache >= 2
+Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _socketdir      /var/run/httpd/fastcgi
 
 %description
 This 3rd party module provides support for the FastCGI protocol.
@@ -52,6 +56,8 @@ FastCGI - 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} -f Makefile.AP2 \
@@ -60,7 +66,7 @@ FastCGI - 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{_socketdir}/dynamic}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
@@ -72,17 +78,20 @@ rm -rf $RPM_BUILD_ROOT
 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."
- 
+       echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
+fi
+
 %preun
 if [ "$1" = "0" ]; then
        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 docs/*.html
 %attr(755,root,root) %{_pkglibdir}/*.so
 %config %{_sysconfdir}/httpd.conf/*.conf
+%dir %attr(770,root,http) %{_socketdir}
+%dir %attr(770,root,http) %{_socketdir}/dynamic