Author: qboosh Date: Sat Jan 26 12:51:49 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated init script (added try-restart action)
- dropped unused apache-icons.tar.gz (4 inconsistent icons with unclear origin
and license)
---- Files affected:
SPECS:
apache.spec (1.517 -> 1.518)
---- Diffs:
================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.517 SPECS/apache.spec:1.518
--- SPECS/apache.spec:1.517 Fri Jan 25 18:04:06 2008
+++ SPECS/apache.spec Sat Jan 26 13:51:44 2008
@@ -42,9 +42,9 @@
# Source0-md5: 39a755eb0f584c279336387b321e3dfc
Source1: %{name}.init
Source2: %{name}.logrotate
-Source3: %{name}-icons.tar.gz
-# Source3-md5: 2b085cbc19fd28536dc883f0b864cd83
-Source4: %{name}.sysconfig
+Source3: %{name}.sysconfig
+Source4: %{name}-server.crt
+Source5: %{name}-server.key
Source6: %{name}-httpd.conf
Source7: %{name}-common.conf
Source8: %{name}-mod_vhost_alias.conf
@@ -59,17 +59,15 @@
Source17: %{name}-mod_autoindex.conf
Source18: %{name}-multilang-errordoc.conf
Source19: %{name}-manual.conf
-Source20: %{name}-server.crt
-Source21: %{name}-server.key
-Source22: %{name}-mod_userdir.conf
-Source23: %{name}-mpm.conf
-Source24: %{name}-languages.conf
-Source25: %{name}-mod_mime.conf
-Source27: %{name}-mod_authz_host.conf
-Source28: %{name}-mod_cgid.conf
-Source29: %{name}-mod_log_config.conf
-Source30: %{name}-mod_mime_magic.conf
-Source31: %{name}-mod_cache.conf
+Source20: %{name}-mod_userdir.conf
+Source21: %{name}-mpm.conf
+Source22: %{name}-languages.conf
+Source23: %{name}-mod_mime.conf
+Source24: %{name}-mod_authz_host.conf
+Source25: %{name}-mod_cgid.conf
+Source26: %{name}-mod_log_config.conf
+Source27: %{name}-mod_mime_magic.conf
+Source28: %{name}-mod_cache.conf
Patch0: %{name}-configdir_skip_backups.patch
Patch1: %{name}-layout.patch
Patch2: %{name}-suexec.patch
@@ -1889,14 +1887,14 @@
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
+install %{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
-install %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
-install %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.crt
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ssl/server.key
%endif
install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -1905,12 +1903,12 @@
install %{SOURCE7} $CFG/10_common.conf
-install %{SOURCE25} $CFG/01_mod_mime.conf
-install %{SOURCE27} $CFG/01_mod_authz_host.conf
-install %{SOURCE28} $CFG/01_mod_cgid.conf
-install %{SOURCE29} $CFG/01_mod_log_config.conf
-install %{SOURCE30} $CFG/01_mod_mime_magic.conf
-install %{SOURCE31} $CFG/01_mod_cache.conf
+install %{SOURCE23} $CFG/01_mod_mime.conf
+install %{SOURCE24} $CFG/01_mod_authz_host.conf
+install %{SOURCE25} $CFG/01_mod_cgid.conf
+install %{SOURCE26} $CFG/01_mod_log_config.conf
+install %{SOURCE27} $CFG/01_mod_mime_magic.conf
+install %{SOURCE28} $CFG/01_mod_cache.conf
install %{SOURCE8} $CFG/20_mod_vhost_alias.conf
install %{SOURCE9} $CFG/25_mod_status.conf
install %{SOURCE10} $CFG/30_mod_proxy.conf
@@ -1923,9 +1921,9 @@
install %{SOURCE17} $CFG/57_mod_autoindex.conf
install %{SOURCE18} $CFG/30_errordocs.conf
install %{SOURCE19} $CFG/30_manual.conf
-install %{SOURCE22} $CFG/16_mod_userdir.conf
-install %{SOURCE23} $CFG/10_mpm.conf
-install %{SOURCE24} $CFG/20_languages.conf
+install %{SOURCE20} $CFG/16_mod_userdir.conf
+install %{SOURCE21} $CFG/10_mpm.conf
+install %{SOURCE22} $CFG/20_languages.conf
echo "LoadModule alias_module modules/mod_alias.so" > $CFG/00_mod_alias.conf
echo "LoadModule authn_file_module modules/mod_authn_file.so" >
$CFG/00_mod_authn_file.conf
@@ -2714,6 +2712,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.518 2008-01-26 12:51:44 qboosh
+- updated init script (added try-restart action)
+- dropped unused apache-icons.tar.gz (4 inconsistent icons with unclear origin
and license)
+
Revision 1.517 2008-01-25 17:04:06 qboosh
- tabs
- suexec gid question about 100..499 obsolete (these are system gids now)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache.spec?r1=1.517&r2=1.518&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
