SPECS: apache-mod_perl.spec, libapreq2.spec, apache-mod_auth_kerb....

glen glen at pld-linux.org
Wed Dec 26 19:03:16 CET 2007 

Author: glen                         Date: Wed Dec 26 18:03:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use apacheconfdir/apachelibdir macros

---- Files affected:
SPECS:
   apache-mod_perl.spec (1.158 -> 1.159) , libapreq2.spec (1.41 -> 1.42) , apache-mod_auth_kerb.spec (1.16 -> 1.17) , subversion.spec (1.200 -> 1.201) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_perl.spec
diff -u SPECS/apache-mod_perl.spec:1.158 SPECS/apache-mod_perl.spec:1.159
--- SPECS/apache-mod_perl.spec:1.158	Wed Dec 26 18:53:56 2007
+++ SPECS/apache-mod_perl.spec	Wed Dec 26 19:03:11 2007
@@ -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		pkgconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
-%define		pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{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},%{pkgconfdir}}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
 %{__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%{pkgconfdir}/75_mod_perl.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/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) %{pkgconfdir}/*.conf
-%attr(755,root,root) %{pkglibdir}/*.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*.conf
+%attr(755,root,root) %{apachelibdir}/*.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.159  2007-12-26 18:03:11  glen
+- use apacheconfdir/apachelibdir macros
+
 Revision 1.158  2007-12-26 17:53:56  glen
 - use conf.d for apache config fragment; rel 5
 

================================================================
Index: SPECS/libapreq2.spec
diff -u SPECS/libapreq2.spec:1.41 SPECS/libapreq2.spec:1.42
--- SPECS/libapreq2.spec:1.41	Wed Dec 26 18:57:40 2007
+++ SPECS/libapreq2.spec	Wed Dec 26 19:03:11 2007
@@ -34,8 +34,8 @@
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		pkgconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
-%define		pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 libapreq is a safe, standards-compliant, high-performance library used
@@ -127,8 +127,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/APR/{Request.pod,Request/*.pod}
-rm -f $RPM_BUILD_ROOT%{pkglibdir}/mod_apreq2.{a,la}
-install -D %{SOURCE1} $RPM_BUILD_ROOT%{pkgconfdir}/76_mod_apreq2.conf
+rm -f $RPM_BUILD_ROOT%{apachelibdir}/mod_apreq2.{a,la}
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/76_mod_apreq2.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -181,8 +181,8 @@
 
 %files -n apache-mod_apreq2
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*_mod_apreq2.conf
-%attr(755,root,root) %{pkglibdir}/mod_apreq2.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_apreq2.conf
+%attr(755,root,root) %{apachelibdir}/mod_apreq2.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -190,6 +190,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42  2007-12-26 18:03:11  glen
+- use apacheconfdir/apachelibdir macros
+
 Revision 1.41  2007-12-26 17:57:40  glen
 - use conf.d for apache config fragment; rel 5
 

================================================================
Index: SPECS/apache-mod_auth_kerb.spec
diff -u SPECS/apache-mod_auth_kerb.spec:1.16 SPECS/apache-mod_auth_kerb.spec:1.17
--- SPECS/apache-mod_auth_kerb.spec:1.16	Wed Dec 26 18:58:55 2007
+++ SPECS/apache-mod_auth_kerb.spec	Wed Dec 26 19:03:11 2007
@@ -26,8 +26,8 @@
 Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		pkgconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
-%define		pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 This is an authentication module for Apache that allows you to
@@ -51,10 +51,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{pkglibdir},%{pkgconfdir}}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
-install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{pkgconfdir}/20_mod_%{mod_name}.conf
+install src/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{apachelibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/20_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,8 +70,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*_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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2007-12-26 18:03:11  glen
+- use apacheconfdir/apachelibdir macros
+
 Revision 1.16  2007-12-26 17:58:55  glen
 - use conf.d for apache config fragment; rel 2
 

================================================================
Index: SPECS/subversion.spec
diff -u SPECS/subversion.spec:1.200 SPECS/subversion.spec:1.201
--- SPECS/subversion.spec:1.200	Wed Dec 26 19:01:27 2007
+++ SPECS/subversion.spec	Wed Dec 26 19:03:11 2007
@@ -68,8 +68,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir		%{_libdir}/svn
-%define		pkgconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
-%define		pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 The goal of the Subversion project is to build a version control
@@ -337,7 +337,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,bash_completion.d} \
-	$RPM_BUILD_ROOT{%{pkgconfdir},%{pkglibdir},%{_infodir}} \
+	$RPM_BUILD_ROOT{%{apacheconfdir},%{apachelibdir},%{_infodir}} \
 	$RPM_BUILD_ROOT%{_examplesdir}/{%{name}-%{version},python-%{name}-%{version}} \
 	$RPM_BUILD_ROOT/home/services/subversion{,/repos}
 
@@ -363,8 +363,8 @@
 %endif
 
 %if %{with apache}
-install %{SOURCE1} $RPM_BUILD_ROOT%{pkgconfdir}/65_mod_dav_svn.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{pkgconfdir}/66_mod_authz_svn.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/65_mod_dav_svn.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{apacheconfdir}/66_mod_authz_svn.conf
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/svnserve
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/svnserve
 %endif
@@ -504,14 +504,14 @@
 %if %{with apache}
 %files -n apache-mod_dav_svn
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*_mod_dav_svn.conf
-%attr(755,root,root) %{pkglibdir}/mod_dav_svn.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_dav_svn.conf
+%attr(755,root,root) %{apachelibdir}/mod_dav_svn.so
 
 %files -n apache-mod_authz_svn
 %defattr(644,root,root,755)
 %doc subversion/mod_authz_svn/INSTALL
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*_mod_authz_svn.conf
-%attr(755,root,root) %{pkglibdir}/mod_authz_svn.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_authz_svn.conf
+%attr(755,root,root) %{apachelibdir}/mod_authz_svn.so
 %endif
 
 %endif # net_client_only
@@ -522,6 +522,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.201  2007-12-26 18:03:11  glen
+- use apacheconfdir/apachelibdir macros
+
 Revision 1.200  2007-12-26 18:01:27  glen
 - use conf.d for apache config fragment; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_perl.spec?r1=1.158&r2=1.159&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libapreq2.spec?r1=1.41&r2=1.42&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_auth_kerb.spec?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/subversion.spec?r1=1.200&r2=1.201&f=u

More information about the pld-cvs-commit mailing list