SPECS: apache-mod_fastcgi.spec - set socket dir to /var/run/apache...

[glen]

Author: glen                         Date: Sun Jun 26 15:42:00 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- set socket dir to /var/run/apache as webserver has no permissions to logdir
- rel 6
- STBR

---- Files affected:
SPECS:
   apache-mod_fastcgi.spec (1.41 -> 1.42) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_fastcgi.spec
diff -u SPECS/apache-mod_fastcgi.spec:1.41 SPECS/apache-mod_fastcgi.spec:1.42
--- SPECS/apache-mod_fastcgi.spec:1.41	Fri Oct 29 11:01:59 2004
+++ SPECS/apache-mod_fastcgi.spec	Sun Jun 26 17:41:55 2005
@@ -8,13 +8,14 @@
 Name:		apache-mod_%{mod_name}
 # NOTE: remember about apache1-mod_fastcgi.spec when messing here
 Version:	2.4.2
-Release:	5
+Release:	6
 License:	distributable
 Group:		Networking/Daemons
 Source0:	http://www.FastCGI.com/dist/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5:	e994414304b535cb99e10b7d1cad1d1e
 Patch0:		%{name}-apr1.patch
 Patch1:		%{name}-allow-uid-gid.patch
+Patch2:		%{name}-socketdir.patch
 Source1:	%{name}.conf
 URL:		http://www.FastCGI.com/
 BuildRequires:	%{apxs}
@@ -26,6 +27,8 @@
 
 %define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+# FIXME /var/run/httpd, but apache.spec owns /var/run/apache, so fix there first.
+%define		_socketdir	/var/run/apache/fastcgi
 
 %description
 This 3rd party module provides support for the FastCGI protocol.
@@ -56,6 +59,7 @@
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__make} -f Makefile.AP2 \
@@ -64,7 +68,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{_socketdir}/dynamic}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/httpd.conf/
@@ -78,19 +82,21 @@
 else
 	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache HTTP daemon."
 fi
- 
+
 %preun
 if [ "$1" = "0" ]; then
 	if [ -f /var/lock/subsys/httpd ]; then
 		/etc/rc.d/init.d/httpd restart 1>&2
 	fi
 fi
- 
+
 %files
 %defattr(644,root,root,755)
 %doc docs/LICENSE.TERMS CHANGES docs/*.html
 %attr(755,root,root) %{_pkglibdir}/*.so
 %config %{_sysconfdir}/httpd.conf/*.conf
+%dir %attr(770,root,http) %{_socketdir}
+%dir %attr(770,root,http) %{_socketdir}/dynamic
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -98,6 +104,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2005/06/26 15:41:55  glen
+- set socket dir to /var/run/apache as webserver has no permissions to logdir
+- rel 6
+- STBR
+
 Revision 1.41  2004/10/29 09:01:59  paladine
 - "HTTP" unification
 
@@ -162,7 +173,7 @@
 - release 1: use new %doc.
 
 Revision 1.20  2002/04/25 15:45:51  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.19  2002/04/25 14:54:51  areq
 - 2.2.12, STBR -> test
@@ -178,9 +189,9 @@
 - release 5
 
 Revision 1.15  2002/02/17 19:01:42  ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
 
 Revision 1.14  2002/02/17 04:59:36  kloczek
 - release 4.
@@ -190,7 +201,7 @@
 - adapterized
 
 Revision 1.12  2002/01/18 02:12:20  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.11  2001/12/02 12:07:03  kloczek
 - release 3.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_fastcgi.spec?r1=1.41&r2=1.42&f=u