gunnar: server/horde/fbview-kronolith ChangeLog, 1.2, 1.3 Makefile, 1.5, 1.6 fbview-kronolith.spec, 1.19, 1.20 HK-GW-Fbview_menu.patch, 1.1, NONE HK-GW-Fbview_relevance.patch, 1.1, NONE HK-GW-Fbview_xfb_access.patch, 1.1, NONE HK-JS-Fix_library_import.patch, 1.1, NONE HK-SB-Fbview_extra_params.patch, 1.1, NONE HK-SB-Fbview_save_attendees.patch, 1.1, NONE conf.php, 1.1, NONE prefs.php, 1.3, NONE

Fri Mar 14 18:28:02 CET 2008

Author: gunnar

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

Modified Files:
	ChangeLog Makefile fbview-kronolith.spec 
Removed Files:
	HK-GW-Fbview_menu.patch HK-GW-Fbview_relevance.patch 
	HK-GW-Fbview_xfb_access.patch HK-JS-Fix_library_import.patch 
	HK-SB-Fbview_extra_params.patch 
	HK-SB-Fbview_save_attendees.patch conf.php prefs.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3

--- ChangeLog	29 Nov 2007 08:25:51 -0000	1.2
+++ ChangeLog	14 Mar 2008 17:28:00 -0000	1.3
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* fbview-kronolith.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* fbview-kronolith.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	30 Nov 2007 05:55:51 -0000	1.5
+++ Makefile	14 Mar 2008 17:28:00 -0000	1.6
@@ -23,7 +23,7 @@
 UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\s*\([0-9.a-z-]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
-PATCHES = $(shell find . -name "*.patch")
+PATCHES = $(shell grep "^Patch[0-9]*:" *.spec | sed -e "s/^Patch[0-9]*:\s*\(.*\).*/\1/")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -43,18 +43,14 @@
 	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	rm -rf *~
 
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog 
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(TEMPLATES) $(CONFIGS) ChangeLog 
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
-	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
+	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
+	  wget -c "$$PATCH"; done
 
-	if [ -n "$(PATCHES)" ]; then              \
-	  for PATCH in $(PATCHES);             \
-	  do                                        \
-	    cp $$PATCH $(KOLABRPMSRC)/$(PACKAGE);\
-	  done;                                     \
-	fi
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \
 	  for TEMPLATE in $(TEMPLATES);             \

Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- fbview-kronolith.spec	30 Nov 2007 06:47:22 -0000	1.19
+++ fbview-kronolith.spec	14 Mar 2008 17:28:00 -0000	1.20
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name kronolith
 %define         V_package fbview-%{V_horde_name}
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   29
-%define         V_version 2.2_rc1
-%define         V_uver    2.2-rc1
+%define         V_year  2008
+%define         V_month 02
+%define         V_day   26
+%define         V_version 2.2_rc2
+%define         V_uver    2.2-rc2
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -24,16 +24,15 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
 Source1:        fbview-kronolith-conf.template
-Source2:        conf.php
-Source3:        prefs.php
 
 # List of Patches
-Patch0:         HK-SB-Fbview_extra_params.patch
-Patch1:         HK-SB-Fbview_save_attendees.patch
-Patch2:         HK-JS-Fix_library_import.patch
-Patch3:         HK-GW-Fbview_menu.patch
-Patch4:         HK-GW-Fbview_relevance.patch
-Patch5:         HK-GW-Fbview_xfb_access.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-SB-Fbview_save_attendees_fbview-kronolith-3.2-rc2.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-SB-Fbview_extra_params_fbview-kronolith-3.2-rc2.patch
+Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_relevance_fbview-kronolith-3.2-rc2.patch
+Patch3:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_xfb_access_fbview-kronolith-3.2-rc2.patch
+Patch4:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Fbview_menu_fbview-kronolith-3.2-rc2.patch
+Patch5:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-kronolith-3.2-rc2/HK-GW-Config_fbview-kronolith-3.2-rc2.patch
+
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -79,7 +78,7 @@
 
 	cd %{V_horde_name}-h3-%{V_uver}
 
-	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+	cd config && for fl in *.dist;do if [ ! -e "${fl/.dist/}" ]; then cp $fl ${fl/.dist/};fi;done; cd ..
 
 	# Remove some stuff not necessary for fbview
 	rm add.php day.php view.php                            \
@@ -89,21 +88,17 @@
            data.php event.php
 
 	find . -name '*.orig' | xargs rm
+
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/
 
 	cd ..
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
-
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:2} %{S:3}      \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                            \
 	    '%config(noreplace)' %{l_prefix}/etc/kolab/templates/fbview-kronolith-conf.template   \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/conf.php \
-	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/prefs.php
+	    '%config(noreplace)' %{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- HK-GW-Fbview_menu.patch DELETED ---

--- HK-GW-Fbview_relevance.patch DELETED ---

--- HK-GW-Fbview_xfb_access.patch DELETED ---

--- HK-JS-Fix_library_import.patch DELETED ---

--- HK-SB-Fbview_extra_params.patch DELETED ---

--- HK-SB-Fbview_save_attendees.patch DELETED ---

--- conf.php DELETED ---

--- prefs.php DELETED ---



