SPECS: apache-mod_python.spec - fixed broken directory dep on /etc...

[hawk]

Author: hawk                         Date: Sat Feb 16 15:01:10 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed broken directory dep on /etc/httpd/httpd.conf
- release 2

---- Files affected:
SPECS:
   apache-mod_python.spec (1.91 -> 1.92) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_python.spec
diff -u SPECS/apache-mod_python.spec:1.91 SPECS/apache-mod_python.spec:1.92
--- SPECS/apache-mod_python.spec:1.91	Tue Feb  5 16:58:32 2008
+++ SPECS/apache-mod_python.spec	Sat Feb 16 16:01:05 2008
@@ -20,7 +20,7 @@
 Summary(sv.UTF-8):	En inbyggd Python-interpretator för webbservern Apache
 Name:		apache-mod_%{mod_name}
 Version:	3.3.1
-Release:	1
+Release:	2
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
@@ -46,8 +46,8 @@
 %requires_eq	python-libs
 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		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 Mod_python is a module that embeds the Python language interpreter
@@ -138,12 +138,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/60_mod_python.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/60_mod_python.conf
 %py_postclean
 
 %clean
@@ -161,8 +161,8 @@
 %defattr(644,root,root,755)
 %doc doc-html/* README COPYRIGHT NEWS CREDITS
 %doc examples
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{apachelibdir}/*.so
 %dir %{py_sitedir}/mod_%{mod_name}
 %attr(755,root,root) %{py_sitedir}/mod_%{mod_name}/*.so
 %{py_sitedir}/mod_%{mod_name}/*.py[co]
@@ -173,6 +173,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.92  2008-02-16 15:01:05  hawk
+- fixed broken directory dep on /etc/httpd/httpd.conf
+- release 2
+
 Revision 1.91  2008-02-05 15:58:32  matkor
 - Version 3.3.1-1.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_python.spec?r1=1.91&r2=1.92&f=u