SPECS: scgi.spec - fixed post scripts in wrong package - added apa...

[glen]

Author: glen                         Date: Wed Jan  4 14:21:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed post scripts in wrong package
- added apache_modules_api to apache package
- use %service to respect skip auto restarts of services

---- Files affected:
SPECS:
   scgi.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/scgi.spec
diff -u SPECS/scgi.spec:1.7 SPECS/scgi.spec:1.8
--- SPECS/scgi.spec:1.7	Mon Nov 21 08:00:24 2005
+++ SPECS/scgi.spec	Wed Jan  4 15:21:42 2006
@@ -1,14 +1,11 @@
 # $Revision$, $Date$
-#
 # TODO:
 #   - there is also support for apache1 in scgi-1.2.tar.gz
 #   - there is cgi2scgi.c (CGI script that forwards requests to a SCGI server)
 #     which may be compiled and instaled in cgi-bin
 #   - python-scgi not tested; apache-mod_scgi works for me
 #
-
 %define		apxs	/usr/sbin/apxs
-
 Summary:	SCGI - a replacement for the Common Gateway Interface (CGI)
 Summary(pl):	SCGI - zastępnik dla Common Gateway Interface (CGI)
 Name:		scgi
@@ -22,9 +19,10 @@
 # Source0-md5:	577f6db7ab95e602378293756d368112
 Patch0:		%{name}-apache2.patch
 URL:		http://www.mems-exchange.org/software/scgi/
-BuildRequires:	python-devel >= 1:2.3
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
+BuildRequires:	apache-devel >= 2.0
+BuildRequires:	python-devel >= 1:2.3
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,6 +41,7 @@
 Summary:	SCGI - a replacement for the Common Gateway Interface (CGI)
 Summary(pl):	SCGI - zastępnik dla Common Gateway Interface (CGI)
 Group:		Networking/Daemons
+Requires:	apache(modules-api) = %apache_modules_api
 %pyrequires_eq  python-modules
 
 %description -n apache-mod_scgi
@@ -94,7 +93,6 @@
 cd apache2
 %{apxs} -c mod_scgi.c
 cd ..
-
 env CFLAGS="%{rpmcflags}" python setup.py build
 
 %install
@@ -106,8 +104,8 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf/60_mod_scgi.conf
 
 python -- setup.py install \
-        --root=$RPM_BUILD_ROOT \
-        --optimize=2
+	--root=$RPM_BUILD_ROOT \
+	--optimize=2
 
 find $RPM_BUILD_ROOT%{py_sitedir} -name \*.py | xargs rm -f
 install -d $RPM_BUILD_ROOT%{py_sitescriptdir}/%{name}
@@ -116,16 +114,12 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%post -n apache-mod_scgi
+%service httpd restart
 
-%preun
+%preun -n apache-mod_scgi
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service httpd restart
 fi
 
 %files -n apache-mod_scgi
@@ -146,6 +140,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2006/01/04 14:21:42  glen
+- fixed post scripts in wrong package
+- added apache_modules_api to apache package
+- use %service to respect skip auto restarts of services
+
 Revision 1.7  2005/11/21 07:00:24  qboosh
 - fixed Name issue (Name=scgi, no main binary package)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scgi.spec?r1=1.7&r2=1.8&f=u