SPECS: drupal-mod-image.spec - FHS fix for files dir

glen glen at pld-linux.org
Tue Dec 6 16:07:50 CET 2005


Author: glen                         Date: Tue Dec  6 15:07:50 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- FHS fix for files dir

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

---- Diffs:

================================================================
Index: SPECS/drupal-mod-image.spec
diff -u SPECS/drupal-mod-image.spec:1.10 SPECS/drupal-mod-image.spec:1.11
--- SPECS/drupal-mod-image.spec:1.10	Fri Sep 30 16:56:32 2005
+++ SPECS/drupal-mod-image.spec	Tue Dec  6 16:07:45 2005
@@ -4,7 +4,7 @@
 Summary(pl):	Moduł Image dla Drupala
 Name:		drupal-mod-%{modname}
 Version:	4.6.0
-Release:	0.22
+Release:	0.23
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://drupal.org/files/projects/%{modname}-%{version}.tar.gz
@@ -25,6 +25,7 @@
 %define		_incdir		%{_drupaldir}/includes
 %define		_htdocs		%{_drupaldir}/htdocs
 %define		_podir		%{_drupaldir}/po/%{modname}
+%define		_filesdir	/var/lib/drupal
 %define		_htmlmoddir	%{_htdocs}/modules
 
 %description
@@ -47,7 +48,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_moddir},%{_podir},%{_htmlmoddir},%{_incdir},%{_htdocs}/files/images/temp}
+install -d $RPM_BUILD_ROOT{%{_moddir},%{_podir},%{_htmlmoddir},%{_incdir},%{_filesdir}/images/temp}
 
 install *.module $RPM_BUILD_ROOT%{_moddir}
 install *.inc $RPM_BUILD_ROOT%{_incdir}
@@ -73,9 +74,8 @@
 %{_incdir}/*.inc
 %{_podir}
 %{_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
+%dir %attr(775,root,http) %{_filesdir}/images
+%dir %attr(775,root,http) %{_filesdir}/images/temp
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -83,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/12/06 15:07:45  glen
+- FHS fix for files dir
+
 Revision 1.10  2005/09/30 14:56:32  glen
 - move po dir out of modules dir
 - unify macros
================================================================

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




More information about the pld-cvs-commit mailing list