[packages/apache/feat/conf-modules: 2/26] prepare for conf.modules.d

[glen]

commit 0d088e92a050cf4b57a966101ce305f01ca827a6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Aug 20 22:20:13 2014 +0300

    prepare for conf.modules.d

 apache.spec | 64 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index 83b1825..9e10e27 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2743,7 +2743,7 @@ install -d build; cd build
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,systemd/system} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,conf.modules.d,vhosts.d} \
 	$RPM_BUILD_ROOT%{_datadir}/{cgi-bin,vhosts} \
 	$RPM_BUILD_ROOT%{systemdtmpfilesdir} \
 	$RPM_BUILD_ROOT%{systemdunitdir}
@@ -2764,47 +2764,48 @@ rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 ln -s conf.d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
-cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
-cp -a %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/httpd
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/httpd
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
 
 %if %{with ssl}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/ssl
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
-cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
+cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
 %endif
 
 cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
-CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
+cp -p %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-cp -a %{SOURCE7} $CFG/10_common.conf
-cp -a %{SOURCE23} $CFG/01_mod_mime.conf
-cp -a %{SOURCE24} $CFG/01_mod_authz_host.conf
-cp -a %{SOURCE25} $CFG/01_mod_cgid.conf
-cp -a %{SOURCE26} $CFG/01_mod_log_config.conf
-cp -a %{SOURCE27} $CFG/01_mod_mime_magic.conf
-cp -a %{SOURCE28} $CFG/01_mod_cache.conf
-cp -a %{SOURCE8} $CFG/20_mod_vhost_alias.conf
-cp -a %{SOURCE9} $CFG/25_mod_status.conf
-cp -a %{SOURCE10} $CFG/30_mod_proxy.conf
-cp -a %{SOURCE11} $CFG/35_mod_info.conf
-cp -a %{SOURCE12} $CFG/40_mod_ssl.conf
-cp -a %{SOURCE13} $CFG/45_mod_dav.conf
-cp -a %{SOURCE14} $CFG/59_mod_dir.conf
-cp -a %{SOURCE15} $CFG/13_mod_suexec.conf
-cp -a %{SOURCE16} $CFG/58_mod_deflate.conf
-cp -a %{SOURCE17} $CFG/57_mod_autoindex.conf
-cp -a %{SOURCE18} $CFG/30_errordocs.conf
-cp -a %{SOURCE19} $CFG/30_manual.conf
-cp -a %{SOURCE20} $CFG/16_mod_userdir.conf
-cp -a %{SOURCE21} $CFG/10_mpm.conf
-cp -a %{SOURCE22} $CFG/20_languages.conf
-cp -a %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
-
-install %{SOURCE30} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.d"
 
+cp -p %{SOURCE7} $CFG/common.conf
+cp -p %{SOURCE23} $CFG/mod_mime.conf
+cp -p %{SOURCE24} $CFG/mod_authz_host.conf
+cp -p %{SOURCE25} $CFG/mod_cgid.conf
+cp -p %{SOURCE26} $CFG/mod_log_config.conf
+cp -p %{SOURCE27} $CFG/mod_mime_magic.conf
+cp -p %{SOURCE28} $CFG/mod_cache.conf
+cp -p %{SOURCE8} $CFG/mod_vhost_alias.conf
+cp -p %{SOURCE9} $CFG/mod_status.conf
+cp -p %{SOURCE10} $CFG/mod_proxy.conf
+cp -p %{SOURCE11} $CFG/mod_info.conf
+cp -p %{SOURCE12} $CFG/mod_ssl.conf
+cp -p %{SOURCE13} $CFG/mod_dav.conf
+cp -p %{SOURCE14} $CFG/mod_dir.conf
+cp -p %{SOURCE15} $CFG/mod_suexec.conf
+cp -p %{SOURCE16} $CFG/mod_deflate.conf
+cp -p %{SOURCE17} $CFG/mod_autoindex.conf
+cp -p %{SOURCE18} $CFG/errordocs.conf
+cp -p %{SOURCE19} $CFG/manual.conf
+cp -p %{SOURCE20} $CFG/mod_userdir.conf
+cp -p %{SOURCE21} $CFG/mpm.conf
+cp -p %{SOURCE22} $CFG/languages.conf
+cp -p %{SOURCE29} $RPM_BUILD_ROOT%{_sysconfdir}/vhosts.d/example.net.conf
+
+CFG="$RPM_BUILD_ROOT%{_sysconfdir}/conf.modules.d"
 echo "LoadModule access_compat_module   modules/mod_access_compat.so" > $CFG/00_mod_access_compat.conf
 echo "LoadModule actions_module	modules/mod_actions.so" > $CFG/00_mod_actions.conf
 echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf
@@ -2887,7 +2888,6 @@ echo "LoadModule version_module	modules/mod_version.so" > $CFG/00_mod_version.co
 echo "LoadModule watchdog_module        modules/mod_watchdog.so" > $CFG/00_mod_watchdog.conf
 echo "LoadModule xml2enc_module modules/mod_xml2enc.so" > $CFG/00_mod_xml2enc.conf
 
-
 # anything in style dir not ending with .css is trash
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/manual/style/{lang,latex,xsl}
 find $RPM_BUILD_ROOT%{_datadir}/manual/style -type f ! -name '*.css' -print0 | xargs -0r rm -f
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a310d9961edb669ed8e5898368a88f47e282311b