SPECS (DEVEL): horde.spec - patch conf.xml, rather sed-ing

[glen]

Author: glen                         Date: Sun Jul 31 10:29:19 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- patch conf.xml, rather sed-ing

---- Files affected:
SPECS:
   horde.spec (1.95.2.4 -> 1.95.2.5) 

---- Diffs:

================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.95.2.4 SPECS/horde.spec:1.95.2.5
--- SPECS/horde.spec:1.95.2.4	Sat Jul 16 16:22:34 2005
+++ SPECS/horde.spec	Sun Jul 31 12:29:13 2005
@@ -27,6 +27,7 @@
 Patch1:		%{name}-shell.disabled.patch
 Patch2:		%{name}-util-h3.patch
 Patch3:		%{name}-blank-admins.patch
+Patch4:		%{name}-config-xml.patch
 URL:		http://www.horde.org/
 BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
@@ -112,6 +113,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
 
 sed -i -e "
 s#dirname(__FILE__) . '/..#'/usr/share/horde#g
@@ -132,9 +134,8 @@
 for i in config/*.php.dist; do
 	cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist)
 done
-sed -e '
-    s,/tmp/horde.log,/var/log/%{name}/%{name}.log,
-'< config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml
+
+install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml
 > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak
 
 cp -pR  admin/*                 $RPM_BUILD_ROOT%{_appdir}/admin
@@ -333,6 +334,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.95.2.5  2005/07/31 10:29:13  glen
+- patch conf.xml, rather sed-ing
+
 Revision 1.95.2.4  2005/07/16 14:22:34  glen
 - 3.0.5-RC2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.95.2.4&r2=1.95.2.5&f=u