X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_fcgid.spec;h=53a295e0f4fd11647fb05038cfb5fd38205a8eb6;hb=6138508465fe7f7828fd1b3d85272222adfabd93;hp=da58f317724f2efec86d5d54412fc610cf99c899;hpb=1627866a128201bd68db9ab29f8d6a4316b174c3;p=packages%2Fapache-mod_fcgid.git

diff --git a/apache-mod_fcgid.spec b/apache-mod_fcgid.spec
index da58f31..53a295e 100644
--- a/apache-mod_fcgid.spec
+++ b/apache-mod_fcgid.spec
@@ -4,29 +4,29 @@ 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_%{mod_name}
 Version:	1.03
-Release:	1
+Release:	3
 License:	GPL v2
 Group:		Networking/Daemons
 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 >= 2
+BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	libtool
-BuildRequires:	sed >= 4.0
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 2
+BuildRequires:	rpmbuild(macros) >= 1.268
+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		_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.
-mod_fcgid has a new process management strategy, which concentrates
-on reducing the number of fastcgi server, and kick out the corrupt
+mod_fcgid has a new process management strategy, which concentrates on
+reducing the number of fastcgi server, and kick out the corrupt
 fastcgi server as soon as possible.
 
 %description -l pl
@@ -38,11 +38,12 @@ fastcgi najszybciej jak to mo
 %prep
 %setup -q -n mod_%{mod_name}.%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
 	top_dir=%{_pkglibdir} \
-	APXS=%{_apxs} \
+	APXS=%{apxs} \
 	INCLUDES="-I%(%{apxs} -q INCLUDEDIR)"
 
 %install
@@ -50,27 +51,21 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+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
-%config(noreplace) /etc/httpd/httpd.conf/70_mod_fcgid.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so