SPECS: drupal-mod-image.spec - image.imagemagick.inc goes to inclu...

[glen]

Author: glen                         Date: Tue Jul  5 18:18:53 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- image.imagemagick.inc goes to includes dir
- add htdocs/files/images/* dir to package

---- Files affected:
SPECS:
   drupal-mod-image.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/drupal-mod-image.spec
diff -u SPECS/drupal-mod-image.spec:1.3 SPECS/drupal-mod-image.spec:1.4
--- SPECS/drupal-mod-image.spec:1.3	Tue Jul  5 19:48:27 2005
+++ SPECS/drupal-mod-image.spec	Tue Jul  5 20:18:48 2005
@@ -3,7 +3,7 @@
 Summary:	Drupal Image Module
 Name:		drupal-mod-%{modname}
 Version:	4.6.0
-Release:	0.14
+Release:	0.18
 Epoch:		0
 License:	GPL
 Group:		Applications/WWW
@@ -16,7 +16,9 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_moddir		%{_datadir}/drupal/modules
-%define		_htmldir	%{_datadir}/drupal/htdocs/modules
+%define		_incdir		%{_datadir}/drupal/includes
+%define		_htdocs		%{_datadir}/drupal/htdocs
+%define		_htmldir	%{_htdocs}/modules
 %define		_podir		%{_moddir}/po/%{modname}
 
 %description
@@ -32,10 +34,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_moddir},%{_podir},%{_htmldir}}
+install -d $RPM_BUILD_ROOT{%{_moddir},%{_podir},%{_htmldir},%{_incdir},%{_htdocs}/files/images/temp}
 
 install *.module $RPM_BUILD_ROOT%{_moddir}
-install *.inc *.module $RPM_BUILD_ROOT%{_moddir}
+install *.inc $RPM_BUILD_ROOT%{_incdir}
 install *.css $RPM_BUILD_ROOT%{_htmldir}
 cp -a po/*.po $RPM_BUILD_ROOT%{_podir}
 
@@ -55,9 +57,12 @@
 %defattr(644,root,root,755)
 %doc *.txt po/*.pot *.php
 %{_moddir}/*.module
-%{_moddir}/*.inc
+%{_incdir}/*.inc
 %{_podir}
 %{_htmldir}/*.css
+# TODO: FHS says this should go to /var
+%dir %attr(775,root,http) %{_htdocs}/files/images
+%dir %attr(775,root,http) %{_htdocs}/files/images/temp
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +70,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/07/05 18:18:48  glen
+- image.imagemagick.inc goes to includes dir
+- add htdocs/files/images/* dir to package
+
 Revision 1.3  2005/07/05 17:48:27  glen
 - public files moved to htdocs
 - po files moved to modules/po/%{modname}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drupal-mod-image.spec?r1=1.3&r2=1.4&f=u