SPECS: drupal.spec - include files/ dir in htdocs - move .theme fi...

[glen]

Author: glen                         Date: Tue Jul  5 12:49:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- include files/ dir in htdocs
- move .theme files out of htdocs
- install drupal favicon.ico

---- Files affected:
SPECS:
   drupal.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/drupal.spec
diff -u SPECS/drupal.spec:1.10 SPECS/drupal.spec:1.11
--- SPECS/drupal.spec:1.10	Tue Jul  5 12:47:04 2005
+++ SPECS/drupal.spec	Tue Jul  5 14:49:31 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.1
+Release:	0.6
 Epoch:		0
 License:	GPL
 Group:		Applications/WWW
@@ -11,6 +11,8 @@
 # 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
@@ -118,7 +120,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir}/{htdocs,files},%{_sysconfdir},/etc/cron.d}
+install -d $RPM_BUILD_ROOT{%{_appdir}/htdocs/files,%{_sysconfdir},/etc/cron.d}
 
 cp -a *.ico index.php $RPM_BUILD_ROOT%{_appdir}/htdocs
 cp -a misc $RPM_BUILD_ROOT%{_appdir}/htdocs
@@ -128,12 +130,14 @@
 cp -a sites $RPM_BUILD_ROOT%{_sysconfdir}
 
 cp -a themes $RPM_BUILD_ROOT%{_appdir}/htdocs
-# move .xtmpl out of htdocs
-(cd $RPM_BUILD_ROOT%{_appdir}/htdocs && tar cf - --remove-files themes/*/*.xtmpl) | tar -xf - -C $RPM_BUILD_ROOT%{_appdir}
+
+# move .xtmpl/.theme out of htdocs
+(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 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_appdir}/htdocs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -176,13 +180,16 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites/default/*
 
 %dir %{_appdir}
-%{_appdir}/htdocs
 %{_appdir}/includes
 %{_appdir}/modules
 %{_appdir}/scripts
 %{_appdir}/themes
 
-%dir %attr(775,root,http) %{_appdir}/files
+%dir %{_appdir}/htdocs
+%{_appdir}/htdocs/*.*
+%{_appdir}/htdocs/misc
+%{_appdir}/htdocs/themes
+%dir %attr(775,root,http) %{_appdir}/htdocs/files
 
 %files cron
 %defattr(644,root,root,755)
@@ -195,6 +202,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/07/05 12:49:31  glen
+- include files/ dir in htdocs
+- move .theme files out of htdocs
+- install drupal favicon.ico
+
 Revision 1.10  2005/07/05 10:47:04  glen
 - drupal 4.6.2
 
================================================================

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