- restored suexec-path.patch, our apache uses this for suexec.fcgi wrapper

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

diff --git a/apache-mod_fcgid.spec b/apache-mod_fcgid.spec
index d7fcee70889dddd32c2afd800dfb12c4ae08292f..1f9b3054342b206d586c772272a61d9c22641bdc 100644 (file)
--- a/apache-mod_fcgid.spec
+++ b/apache-mod_fcgid.spec
@@ -3,16 +3,15 @@
 Summary:       A binary compatibility alternative to Apache module mod_fastcgi
 Summary(pl.UTF-8):     Binarnie kompatybilna alternatywa dla modułu Apache'a mod_fastcgi
 Name:          apache-mod_%{mod_name}
-Version:       1.03
-Release:       3
+Version:       2.3.6
+Release:       0.1
 License:       GPL v2
-Group:         Networking/Daemons
-Source0:       http://fastcgi.coremail.cn/mod_%{mod_name}.%{version}.tar.gz
-# Source0-md5: dbcd5c96f8d6c6fcb7471abf527d176f
+Group:         Networking/Daemons/HTTP
+Source0:       http://www.apache.org/dist/httpd/mod_fcgid/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: fbfc115eb47cd9bda91269743aba5e83
 Source1:       %{name}.conf
-Patch0:                %{name}-apr-status-is-success.patch
-Patch1:                %{name}-apache.patch
-URL:           http://fastcgi.coremail.cn/
+Patch0:                %{name}-suexec-path.patch
+URL:           http://httpd.apache.org/mod_fcgid/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.52-2
 BuildRequires: libtool
@@ -21,7 +20,7 @@ Requires:     apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 A binary compatibility alternative to Apache module mod_fastcgi.
@@ -36,11 +35,11 @@ na redukcji liczby serwerów fastcgi i usuwaniu uszkodzonych serwerów
 fastcgi najszybciej jak to możliwe.
 
 %prep
-%setup -q -n mod_%{mod_name}.%{version}
+%setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
+APXS=%{apxs} ./configure.apxs
 %{__make} \
        top_dir=%{_pkglibdir} \
        APXS=%{apxs} \
@@ -48,10 +47,10 @@ fastcgi najszybciej jak to możliwe.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
-install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+install modules/fcgid/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/70_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,6 +65,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHOR ChangeLog
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%doc CHANGES-FCGID LICENSE-FCGID NOTICE-FCGID README-FCGID STATUS-FCGID
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so