From bd802f5351f9748c8e9b6c29693c419d097e1815 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 26 Dec 2007 18:03:11 +0000 Subject: [PATCH] - use apacheconfdir/apachelibdir macros Changed files: apache-mod_perl.spec -> 1.159 --- apache-mod_perl.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apache-mod_perl.spec b/apache-mod_perl.spec index 807ef4e..07e14e9 100644 --- a/apache-mod_perl.spec +++ b/apache-mod_perl.spec @@ -70,8 +70,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # 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, @@ -263,7 +263,7 @@ rm -rf Apache-Test %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 @@ -277,7 +277,7 @@ rm -rf $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle 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 @@ -293,8 +293,8 @@ fi %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) -- 2.44.0