gunnar: server/horde/fbview-horde fbview-horde-conf.template, 1.1, 1.2 fbview-horde.spec, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv24008/horde/fbview-horde

Modified Files:
	fbview-horde-conf.template fbview-horde.spec 
Log Message:
Fix fbview-horde to compile into a source RPM.

Index: fbview-horde-conf.template
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbview-horde-conf.template	2 Aug 2007 08:09:48 -0000	1.1
+++ fbview-horde-conf.template	2 Aug 2007 08:19:08 -0000	1.2
@@ -1,5 +1,5 @@
 KOLAB_META_START
-TARGET=/kolab/var/kolab/www/horde/config/kolab.php
+TARGET=/kolab/var/kolab/www/fbview/config/kolab.php
 PERMISSIONS=0600
 OWNERSHIP=kolab-n:kolab-n
 KOLAB_META_END

Index: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fbview-horde.spec	2 Aug 2007 08:09:48 -0000	1.1
+++ fbview-horde.spec	2 Aug 2007 08:19:08 -0000	1.2
@@ -62,7 +62,7 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	cd horde/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
-	cp -r horde $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview
+	cp -r horde/* $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
@@ -71,7 +71,7 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/config/
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-kolab-conf.template'\
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-horde-conf.template'\
 	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php'    \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/conf.php'    \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/hooks.php'   \