- use %service

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

diff --git a/apache-mod_fcgid.spec b/apache-mod_fcgid.spec
index 7f742fdec591d098529dcf4cc129bc83745b956f..53a295e0f4fd11647fb05038cfb5fd38205a8eb6 100644 (file)
--- a/apache-mod_fcgid.spec
+++ b/apache-mod_fcgid.spec
@@ -1,25 +1,27 @@
-%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.7
-Release:       1
-License:       distributable
+Name:          apache-mod_%{mod_name}
+Version:       1.03
+Release:       3
+License:       GPL v2
 Group:         Networking/Daemons
-Source0:       http://fastcgi.coremail.cn/mod_fcgid.%{version}.tar.gz
-# Source0-md5: 1bfdf0274caf9ecaee089e4b3f70326e
-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
+Patch1:                %{name}-apache.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
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache(modules-api) = %apache_modules_api
 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.
@@ -34,39 +36,36 @@ na redukcji liczby serwer
 fastcgi najszybciej jak to mo¿liwe.
 
 %prep
-%setup -q -n mod_fcgid
+%setup -q -n mod_%{mod_name}.%{version}
+%patch0 -p1
+%patch1 -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."
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/httpd ]; then
-                /etc/rc.d/init.d/httpd restart 1>&2
-        fi
+       %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHOR ChangeLog
-%attr(755,root,root) %{_libexecdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so