requires mod_actions

[packages/apache-php-fcgi.git] / apache-php-fcgi.spec

diff --git a/apache-php-fcgi.spec b/apache-php-fcgi.spec
index 79a294f974864af497c3b23427749af73ef80e2f..740e79361ac944d73f580d17aacbdc55809ee2d5 100644 (file)
--- a/apache-php-fcgi.spec
+++ b/apache-php-fcgi.spec
@@ -1,21 +1,22 @@
-%define                apxs    /usr/sbin/apxs1
+%define                apxs    /usr/sbin/apxs
 Summary:       Support for the PHP via FastCGI protocol for Apache webserver
-Name:          apache1-php-fcgi
-Version:       5.2.6
-Release:       3
+Name:          apache-php-fcgi
+Version:       5.6
+Release:       2
 License:       GPL
 Group:         Applications/WWW
-BuildRequires: apache1-devel >= 1.3.39
+Source0:       apache.conf
+BuildRequires: apache-devel >= 1.3.39
 BuildRequires: rpmbuild(macros) >= 1.268
-Requires:      apache1-mod_fastcgi
-Requires:      php-fcgi >= 4:%{version}
-Requires:      php-fcgi-init
+Requires:      apache-mod_actions
+Requires:      apache-mod_fastcgi
+Requires:      php(fcgi)
+Suggests:      php-fcgi-init
 Provides:      webserver(php) = %{version}
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define                fcgiapp         /usr/bin/php.fcgi
 
 %description
 This virtual package provides support for the PHP via FastCGI
@@ -24,40 +25,20 @@ protocol.
 %prep
 %setup -qcT
 
-cat <<'EOF' > apache.conf
-# setup via fastcgi to run php5
-<IfModule mod_fastcgi.c>
-       # the server name is bogus actually, to satisfy mod_fastcgi
-       FastCgiExternalServer %{fcgiapp} -socket /var/run/php/fcgi.sock -idle-timeout 120
-       ScriptAlias /php-fcgi %{fcgiapp}
-       <Location "/php-fcgi">
-               SetHandler fastcgi-script
-               Allow from all
-       </Location>
-
-       Action application/x-httpd-php-fcgi /php-fcgi
-</IfModule>
-
-# To register handler for .php in your config context:
-#<IfModule mod_fastcgi.c>
-#      AddType application/x-httpd-php-fcgi .php
-#</IfModule>
-EOF
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/conf.d
-cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_php-fcgi.conf
+cp -p %{SOURCE0} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_php-fcgi.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%service -q apache restart
+%service -q httpd restart
 
 %postun
 if [ "$1" = "0" ]; then
-       %service -q apache restart
+       %service -q httpd restart
 fi
 
 %files