gunnar: server/horde/horde-mnemo ChangeLog, 1.6, 1.7 Makefile, 1.6, 1.7 horde-mnemo-kolab.spec, 1.20, 1.21 conf.php, 1.2, NONE

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog Makefile horde-mnemo-kolab.spec 
Removed Files:
	conf.php 
Log Message:
A first commit of the restructured Horde packages. Not finished yet.

Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	29 Nov 2007 08:25:52 -0000	1.6
+++ ChangeLog	14 Mar 2008 17:28:02 -0000	1.7
@@ -1,3 +1,7 @@
+2008-02-26  Gunnar Wrobel  <p at rdus.de>
+
+	* horde-mnemo-kolab.spec: Update to RC2
+
 2007-11-29  Gunnar Wrobel  <p at rdus.de>
 
 	* horde-mnemo-kolab.spec: Update to RC1

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/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-mnemo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-mnemo/horde-mnemo-kolab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-mnemo-kolab.spec	29 Nov 2007 15:32:10 -0000	1.20
+++ horde-mnemo-kolab.spec	14 Mar 2008 17:28:02 -0000	1.21
@@ -1,11 +1,11 @@
 # Versions
 %define         V_horde_name mnemo
 %define         V_package horde-%{V_horde_name}-kolab
-%define         V_year  2007
-%define         V_month 11
-%define         V_day   28
-%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}
 
@@ -23,7 +23,9 @@
 
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1:        conf.php
+
+# List of Patches
+Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/mnemo-3.2-rc2/HK-GW-Config_mnemo-3.2-rc2.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -48,6 +50,7 @@
 	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
 	cd %{V_horde_name}-h3-%{V_uver}
+	%patch -p2 -P 0
 	cd ..
 
 %build
@@ -60,18 +63,17 @@
 
 	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
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
 
 	cd ..
 
-	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1}           \
-	  $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}                                        \
 	    '%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

--- conf.php DELETED ---