SPECS: apache-mod_perl.spec - use conf.d for apache config fragmen...

[glen]

Author: glen                         Date: Wed Dec 26 17:54:02 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use conf.d for apache config fragment; rel 5

---- Files affected:
SPECS:
   apache-mod_perl.spec (1.157 -> 1.158) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_perl.spec
diff -u SPECS/apache-mod_perl.spec:1.157 SPECS/apache-mod_perl.spec:1.158
--- SPECS/apache-mod_perl.spec:1.157	Sat Nov  3 14:23:03 2007
+++ SPECS/apache-mod_perl.spec	Wed Dec 26 18:53:56 2007
@@ -32,7 +32,7 @@
 Summary(zh_CN.UTF-8):	用于 Apache web 服务程序的 Perl 解释程序。
 Name:		apache-mod_perl
 Version:	2.0.3
-Release:	4
+Release:	5
 Epoch:		1
 License:	Apache
 Group:		Networking/Daemons
@@ -71,8 +71,8 @@
 
 # TODO: separate -devel with ExtUtils::Embed and friends?
 %define		_noautoreq	'perl(Apache::.*)' 'perl(mod_perl)' 'perl(ModPerl::.*)' 'perl(ExtUtils::Embed)' 'perl(Module::Build)'
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		pkgconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 Mod_perl incorporates a Perl interpreter into the Apache web server,
@@ -264,7 +264,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{pkglibdir},%{pkgconfdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -278,7 +278,7 @@
 rm -f $RPM_BUILD_ROOT%{_mandir}/man?/Bundle*
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_perl2/.packlist
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/75_mod_perl.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{pkgconfdir}/75_mod_perl.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -294,8 +294,8 @@
 %files
 %defattr(644,root,root,755)
 %doc Changes INSTALL README STATUS
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*.conf
+%attr(755,root,root) %{pkglibdir}/*.so
 
 %files -n perl-mod_%{mod_name}
 %defattr(644,root,root,755)
@@ -326,6 +326,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.158  2007-12-26 17:53:56  glen
+- use conf.d for apache config fragment; rel 5
+
 Revision 1.157  2007-11-03 13:23:03  baggins
 - rel 4
 
================================================================

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