Author: glen Date: Wed Feb 16 21:16:39 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- remove .dist files from config dir (they belong to %doc, if anywhere)
- apache config need not to be readable for http user
- .htaccess not needed, we supply apache main config
---- Files affected:
SPECS:
horde.spec (1.65 -> 1.66)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.65 SPECS/horde.spec:1.66
--- SPECS/horde.spec:1.65 Wed Feb 16 20:42:00 2005
+++ SPECS/horde.spec Wed Feb 16 22:16:33 2005
@@ -9,7 +9,7 @@
Summary(pt_BR): Componentes comuns do Horde usados por todos os módulos
Name: horde
Version: 3.0.3
-Release: 2.8
+Release: 2.11
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -53,7 +53,6 @@
Requires: php-domxml
%endif
-
%description
The Horde Framework provides a common structure and interface for
Horde modules (such as IMP, a web-based mail program). This RPM is
@@ -86,6 +85,9 @@
%setup -q
%patch0 -p1
+# Described in documentation as dangerous file...
+rm test.php
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}/horde \
@@ -98,24 +100,20 @@
for i in admin js lib locale services templates themes util; do
cp -pR $i/* $RPM_BUILD_ROOT%{hordedir}/$i
done
+
for i in lib locale templates; do
cp -p $i/.htaccess $RPM_BUILD_ROOT%{hordedir}/$i
done
-cp -pR config/*.php.dist $RPM_BUILD_ROOT%{_sysconfdir}/horde
-cp -p config/.htaccess $RPM_BUILD_ROOT%{_sysconfdir}/horde
+for i in config/*.php.dist; do
+ cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/horde/$(basename $i .dist)
+done
+
cp -p config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/horde
install %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
ln -fs %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/config
-# Described in documentation as dangerous file...
-rm $RPM_BUILD_ROOT%{hordedir}/test.php
-
-# bit unclean..
-cd $RPM_BUILD_ROOT%{_sysconfdir}/horde
-for i in *.dist; do cp $i `basename $i .dist`; done
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -215,11 +213,9 @@
%{hordedir}/templates
%{hordedir}/themes
%{hordedir}/util
-%attr(640,root,http) %config(noreplace) %{_sysconfdir}/apache.conf
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache.conf
%attr(770,root,http) %dir %{_sysconfdir}/horde
-%attr(640,root,http) %{_sysconfdir}/horde/*.dist
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/horde/*.php
-%attr(640,root,http) %config(noreplace) %{_sysconfdir}/horde/.htaccess
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/horde/*.xml
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -228,6 +224,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2005/02/16 21:16:33 glen
+- remove .dist files from config dir (they belong to %doc, if anywhere)
+- apache config need not to be readable for http user
+- .htaccess not needed, we supply apache main config
+
Revision 1.65 2005/02/16 19:42:00 glen
- fix last trigger
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.65&r2=1.66&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
