SPECS: drupal-mod-image.spec, drupal-mod-img_assist.spec, drupal-m...

glen glen at pld-linux.org
Mon Aug 15 13:45:27 CEST 2005 

Author: glen                         Date: Mon Aug 15 11:45:27 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify drupal path macros

---- Files affected:
SPECS:
   drupal-mod-image.spec (1.7 -> 1.8) , drupal-mod-img_assist.spec (1.6 -> 1.7) , drupal-mod-tinymce.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/drupal-mod-image.spec
diff -u SPECS/drupal-mod-image.spec:1.7 SPECS/drupal-mod-image.spec:1.8
--- SPECS/drupal-mod-image.spec:1.7	Thu Jul  7 18:15:44 2005
+++ SPECS/drupal-mod-image.spec	Mon Aug 15 13:45:21 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Moduł Image dla Drupala
 Name:		drupal-mod-%{modname}
 Version:	4.6.0
-Release:	0.19
+Release:	0.20
 Epoch:		0
 License:	GPL
 Group:		Applications/WWW
@@ -25,7 +25,7 @@
 %define		_moddir		%{_datadir}/drupal/modules
 %define		_incdir		%{_datadir}/drupal/includes
 %define		_htdocs		%{_datadir}/drupal/htdocs
-%define		_htmldir	%{_htdocs}/modules
+%define		_htmlmoddir	%{_htdocs}/modules
 %define		_podir		%{_moddir}/po/%{modname}
 
 %description
@@ -48,11 +48,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_moddir},%{_podir},%{_htmldir},%{_incdir},%{_htdocs}/files/images/temp}
+install -d $RPM_BUILD_ROOT{%{_moddir},%{_podir},%{_htmlmoddir},%{_incdir},%{_htdocs}/files/images/temp}
 
 install *.module $RPM_BUILD_ROOT%{_moddir}
 install *.inc $RPM_BUILD_ROOT%{_incdir}
-install *.css $RPM_BUILD_ROOT%{_htmldir}
+install *.css $RPM_BUILD_ROOT%{_htmlmoddir}
 cp -a po/*.po $RPM_BUILD_ROOT%{_podir}
 
 %clean
@@ -73,7 +73,7 @@
 %{_moddir}/*.module
 %{_incdir}/*.inc
 %{_podir}
-%{_htmldir}/*.css
+%{_htmlmoddir}/*.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
@@ -84,6 +84,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/08/15 11:45:21  glen
+- unify drupal path macros
+
 Revision 1.7  2005/07/07 16:15:44  qboosh
 - Drupal caps unified
 

================================================================
Index: SPECS/drupal-mod-img_assist.spec
diff -u SPECS/drupal-mod-img_assist.spec:1.6 SPECS/drupal-mod-img_assist.spec:1.7
--- SPECS/drupal-mod-img_assist.spec:1.6	Mon Aug 15 12:16:33 2005
+++ SPECS/drupal-mod-img_assist.spec	Mon Aug 15 13:45:21 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Moduł Img_assist dla Drupala
 Name:		drupal-mod-%{modname}
 Version:	4.6.0
-Release:	0.10
+Release:	0.11
 Epoch:		0
 License:	GPL
 Group:		Applications/WWW
@@ -18,7 +18,7 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_moddir		%{_datadir}/drupal/modules
-%define		_htmldir	%{_datadir}/drupal/htdocs/modules
+%define		_htmlmoddir	%{_datadir}/drupal/htdocs/modules
 
 %description
 This module generates an image icon next to the textarea fields of you
@@ -48,10 +48,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_moddir},%{_htmldir}}
+install -d $RPM_BUILD_ROOT{%{_moddir},%{_htmlmoddir}}
 
 install *.module $RPM_BUILD_ROOT%{_moddir}
-install *.css *.js *.jpg $RPM_BUILD_ROOT%{_htmldir}
+install *.css *.js *.jpg $RPM_BUILD_ROOT%{_htmlmoddir}
 ln -s ../htdocs/modules/directory.js $RPM_BUILD_ROOT%{_moddir}
 ln -s ../htdocs/modules/properties.js $RPM_BUILD_ROOT%{_moddir}
 
@@ -71,7 +71,7 @@
 %doc *.txt img_assist.{mysql,pgsql}
 %{_moddir}/*.module
 %{_moddir}/*.js
-%{_htmldir}/*.*
+%{_htmlmoddir}/*.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -79,6 +79,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/08/15 11:45:21  glen
+- unify drupal path macros
+
 Revision 1.6  2005/08/15 10:16:33  glen
 - internal modules dropped
 

================================================================
Index: SPECS/drupal-mod-tinymce.spec
diff -u SPECS/drupal-mod-tinymce.spec:1.3 SPECS/drupal-mod-tinymce.spec:1.4
--- SPECS/drupal-mod-tinymce.spec:1.3	Mon Aug 15 13:42:43 2005
+++ SPECS/drupal-mod-tinymce.spec	Mon Aug 15 13:45:21 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Moduł edytora WYSIWYG TinyMCE dla Drupala
 Name:		drupal-mod-%{modname}
 Version:	4.6.0
-Release:	0.15
+Release:	0.16
 Epoch:		0
 License:	GPL
 Group:		Applications/WWW
@@ -21,7 +21,7 @@
 
 %define		_sysconfdir	/etc/drupal
 %define		_moddir		%{_datadir}/drupal/modules
-%define		_htmldir	%{_datadir}/drupal/htdocs/modules
+%define		_htmlmoddir	%{_datadir}/drupal/htdocs/modules
 %define		_tinymceplugindir	%{_datadir}/tinymce/plugins
 
 %description
@@ -52,15 +52,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_moddir},%{_htmldir}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_moddir},%{_htmlmoddir}}
 install -d $RPM_BUILD_ROOT%{_tinymceplugindir}
 
 install *.module $RPM_BUILD_ROOT%{_moddir}
 cp -a plugins/* $RPM_BUILD_ROOT%{_tinymceplugindir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{modname}.conf
 
-install -d $RPM_BUILD_ROOT%{_htmldir}/tinymce/jscripts
-ln -s %{_datadir}/tinymce $RPM_BUILD_ROOT%{_htmldir}/tinymce/jscripts/tiny_mce
+install -d $RPM_BUILD_ROOT%{_htmlmoddir}/tinymce/jscripts
+ln -s %{_datadir}/tinymce $RPM_BUILD_ROOT%{_htmlmoddir}/tinymce/jscripts/tiny_mce
 ln -s ../htdocs/modules/tinymce $RPM_BUILD_ROOT%{_moddir}/tinymce
 
 %clean
@@ -81,7 +81,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %{_moddir}/*.module
 %{_moddir}/tinymce
-%{_htmldir}/tinymce
+%{_htmlmoddir}/tinymce
 %{_tinymceplugindir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/08/15 11:45:21  glen
+- unify drupal path macros
+
 Revision 1.3  2005/08/15 11:42:43  glen
 - works
 
================================================================

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

More information about the pld-cvs-commit mailing list