SPECS: drupal.spec - apache conf renamed - drupal sources already ...

[glen]

Author: glen                         Date: Wed Jul  6 17:20:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apache conf renamed
- drupal sources already had favicon, remove external one

---- Files affected:
SPECS:
   drupal.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/drupal.spec
diff -u SPECS/drupal.spec:1.15 SPECS/drupal.spec:1.16
--- SPECS/drupal.spec:1.15	Wed Jul  6 18:44:35 2005
+++ SPECS/drupal.spec	Wed Jul  6 19:19:56 2005
@@ -3,7 +3,7 @@
 Summary(pl):	Platforma do zarządzania treścią o otwartych źródłach
 Name:		drupal
 Version:	4.6.2
-Release:	0.16
+Release:	0.18
 Epoch:		0
 License:	GPL
 Group:		Applications/WWW
@@ -11,8 +11,6 @@
 # Source0-md5:	7bbee605d6b57052e27adb1a61685ec1
 Source1:	%{name}.conf
 Source2:	%{name}.cron
-Source3:	http://www.drupal.org/misc/favicon.ico
-# Source3-md5:	f0ee98b4394dfdab17c16245dd799204
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-includedir.patch
 Patch2:		%{name}-module-themedir.patch
@@ -181,9 +179,8 @@
 (cd $RPM_BUILD_ROOT%{_appdir}/htdocs && tar cf - --remove-files themes/*/*.{xtmpl,theme}) | tar -xf - -C $RPM_BUILD_ROOT%{_appdir}
 mv $RPM_BUILD_ROOT%{_appdir}/{htdocs/,}themes/engines
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/htdocs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -203,13 +200,13 @@
 fi
 
 %triggerin -- apache1 >= 1.3.33-2
-%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
 
 %triggerun -- apache1 >= 1.3.33-2
 %apache_config_uninstall -v 1
 
 %triggerin -- apache >= 2.0.0
-%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf
 
 %triggerun -- apache >= 2.0.0
 %apache_config_uninstall -v 2
@@ -219,7 +216,7 @@
 %doc *.txt database
 
 %attr(750,root,http) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache-%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 
 %attr(750,root,http) %dir %{_sysconfdir}/sites
 %attr(750,root,http) %dir %{_sysconfdir}/sites/default
@@ -257,6 +254,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2005/07/06 17:19:56  glen
+- apache conf renamed
+- drupal sources already had favicon, remove external one
+
 Revision 1.15  2005/07/06 16:44:35  glen
 - add xmlrpc (xmlrpc server) subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drupal.spec?r1=1.15&r2=1.16&f=u