gunnar: server/horde/horde-kronolith ChangeLog, 1.5, 1.6 Makefile, 1.6, 1.7 horde-kronolith-kolab.spec, 1.22, 1.23 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

Fri Mar 14 18:28:04 CET 2008

Author: gunnar

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

Modified Files:
	ChangeLog Makefile horde-kronolith-kolab.spec 
Removed Files:
	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 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6

--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.5
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.6
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-kronolith-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-kronolith-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	1 Oct 2007 15:47:19 -0000	1.6
+++ Makefile	14 Mar 2008 17:28:02 -0000	1.7
@@ -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: horde-kronolith-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-kronolith/horde-kronolith-kolab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-kronolith-kolab.spec	30 Nov 2007 06:58:38 -0000	1.22
+++ horde-kronolith-kolab.spec	14 Mar 2008 17:28:02 -0000	1.23
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name kronolith
 %define         V_package horde-%{V_horde_name}-kolab
-%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,14 +24,13 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
 Source1:        horde-kronolith-kolab-conf.template
-Source2:        conf.php
 
 # List of Patches
-Patch0:         HK-JS-Fix_library_import.patch
-Patch1:         HK-SB-Fbview_extra_params.patch
-Patch2:         HK-SB-Fbview_save_attendees.patch
-Patch3:         HK-GW-Fbview_relevance.patch
-Patch4:         HK-GW-Fbview_xfb_access.patch
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Config_kronolith-3.2-rc2.patch
+Patch1:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Fbview_relevance_kronolith-3.2-rc2.patch
+Patch2:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-GW-Fbview_xfb_access_kronolith-3.2-rc2.patch
+Patch3:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-SB-Fbview_extra_params_kronolith-3.2-rc2.patch
+Patch4:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/kronolith-3.2-rc2/HK-SB-Fbview_save_attendees_kronolith-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -78,7 +77,7 @@
 
 	rm -rf test.php
 
-	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 ..
 
 	find . -name '*.orig' | xargs rm
 
@@ -89,13 +88,10 @@
 	%{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}           \
-	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/
-
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}                                            \
 	    '%config(noreplace)'              %{l_prefix}/etc/kolab/templates/horde-kronolith-kolab-conf.template \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php     \
-	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/conf.php
+	    '%config(noreplace)'              %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- 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 ---



