SPECS: apache-mod_suphp.spec - use conf.d for apache config fragme...

[glen]

Author: glen                         Date: Wed Dec 26 18:32:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use conf.d for apache config fragment; rel 2

---- Files affected:
SPECS:
   apache-mod_suphp.spec (1.45 -> 1.46) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_suphp.spec
diff -u SPECS/apache-mod_suphp.spec:1.45 SPECS/apache-mod_suphp.spec:1.46
--- SPECS/apache-mod_suphp.spec:1.45	Sun Dec  9 11:42:23 2007
+++ SPECS/apache-mod_suphp.spec	Wed Dec 26 19:32:17 2007
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Moduł do apache: suPHP - uruchamianie skryptów PHP z uprawnieniami ich właścicieli
 Name:		apache-mod_%{mod_name}
 Version:	0.6.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://www.suphp.org/download/%{mod_name}-%{version}.tar.gz
@@ -32,8 +32,8 @@
 Conflicts:	logrotate < 3.7-4
 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		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 suPHP is a tool for executing PHP scripts with the permissions of
@@ -58,10 +58,9 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export APACHE_VERSION=$(rpm -q --qf '%%{version}' apache-apxs)
+APACHE_VERSION=$(rpm -q --qf '%{V}' apache-devel); export APACHE_VERSION
 %configure \
-	%{?with_checkpath: --enable-checkpath} \
-	%{!?with_checkpath: --disable-checkpath} \
+	--%{?with_checkpath:en}%{!?with_checkpath:dis}able-checkpath \
 	--with-apache-user=http \
 	--with-min-uid=500 \
 	--with-min-gid=1000 \
@@ -75,12 +74,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_pkglibdir},%{_datadir}/suphp}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{apachelibdir},%{_datadir}/suphp}
+install -d $RPM_BUILD_ROOT%{apacheconfdir}
 
 install src/suphp $RPM_BUILD_ROOT%{_sbindir}
-install src/apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+install src/apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
+install %{SOURCE2} $RPM_BUILD_ROOT%{apacheconfdir}/70_mod_%{mod_name}.conf
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{mod_name}.conf
 
 install -d $RPM_BUILD_ROOT/etc/logrotate.d
@@ -102,9 +101,9 @@
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS ChangeLog doc
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(755,root,root) %{apachelibdir}/*.so
 %attr(4755,root,root) %{_sbindir}/suphp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %dir %{_datadir}/suphp
@@ -116,6 +115,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007-12-26 18:32:17  glen
+- use conf.d for apache config fragment; rel 2
+
 Revision 1.45  2007-12-09 10:42:23  glen
 - apache-apxs -> %{apxs} in BR
 
================================================================

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