gunnar: server/horde/horde-framework ChangeLog, 1.13, 1.14 Makefile, 1.10, 1.11 horde-framework-kolab.spec, 1.35, 1.36 HK-GW-Fbview_xfb_concept.patch, 1.1, NONE HK-GW-Fix_Prefs_for_Ingo.patch, 1.1, NONE HK-GW-freebusy_error_handling.patch, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Fri Mar 14 18:28:04 CET 2008
- Previous message: gunnar: server/horde/horde-imp ChangeLog, 1.4, 1.5 Makefile, 1.6, 1.7 horde-imp-kolab.spec, 1.18, 1.19 conf.php, 1.3, NONE servers.php, 1.3, NONE
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv23799/horde-framework
Modified Files:
ChangeLog Makefile horde-framework-kolab.spec
Removed Files:
HK-GW-Fbview_xfb_concept.patch HK-GW-Fix_Prefs_for_Ingo.patch
HK-GW-freebusy_error_handling.patch
Log Message:
A first commit of the restructured Horde packages. Not finished yet.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog 7 Mar 2008 08:46:19 -0000 1.13
+++ ChangeLog 14 Mar 2008 17:28:02 -0000 1.14
@@ -5,6 +5,10 @@
kolab/issue2521 (an event breaking lib/Horde/Kolab/Freebusy.php)
https://www.intevation.de/roundup/kolab/issue2521
+2008-02-26 Gunnar Wrobel <p at rdus.de>
+
+ * horde-framework-kolab.spec: Update to RC2
+
2007-11-29 Gunnar Wrobel <p at rdus.de>
* horde-framework-kolab.spec: Update to RC1
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile 30 Nov 2007 16:13:41 -0000 1.10
+++ Makefile 14 Mar 2008 17:28:02 -0000 1.11
@@ -22,7 +22,7 @@
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\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")
@@ -42,18 +42,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-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- horde-framework-kolab.spec 11 Mar 2008 16:44:36 -0000 1.35
+++ horde-framework-kolab.spec 14 Mar 2008 17:28:02 -0000 1.36
@@ -3,8 +3,8 @@
%define V_package horde-%{V_horde_name}-kolab
%define V_year 2008
%define V_month 03
-%define V_day 11
-%define V_version 3.2_rc1
+%define V_day 13
+%define V_version 3.2_rc3
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -21,14 +21,14 @@
# List of Sources
-# While we download from a non-horde site again this package provides a plain
-# CVS checkout from horde cvs, tagget with HORDE_3.2_ALPHA. Horde sadly does not
-# provide such packages
-Source0: http://build.pardus.de/downloads/horde-%{V_horde_name}-%{V_version}.tar.bz2
+# While we download from a non-horde site again this package provides
+# a plain CVS checkout from horde cvs, tagged with the corresponding
+# version. Horde does not provide such packages
+Source0: http://files.pardus.de/horde-%{V_horde_name}-%{V_version}.tar.bz2
-Patch0: HK-GW-Fix_Prefs_for_Ingo.patch
-Patch1: HK-GW-Fbview_xfb_concept.patch
-Patch2: HK-GW-freebusy_error_handling.patch
+Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Fix_Prefs_for_Ingo_framework-3.2-rc2.patch
+Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Fbview_xfb_concept_framework-3.2-rc2.patch
+Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/framework-3.2-rc2/HK-GW-Share_fixes_framework-3.2-rc2.patch
# Build Info
Prefix: %{l_prefix}
@@ -58,7 +58,7 @@
%install
for PKG in **/package.xml; do \
- if [ "$PKG" != "Role_Webroot/package.xml" -a "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then \
+ if [ "$PKG" != "Role_Webroot/package.xml" -a "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" -a "$PKG" != "Text_Diff/package.xml" ]; then \
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="%{l_prefix}/RPM/TMP/pear/cache" \
%{l_prefix}/bin/pear package $PKG; \
--- HK-GW-Fbview_xfb_concept.patch DELETED ---
--- HK-GW-Fix_Prefs_for_Ingo.patch DELETED ---
--- HK-GW-freebusy_error_handling.patch DELETED ---
- Previous message: gunnar: server/horde/horde-imp ChangeLog, 1.4, 1.5 Makefile, 1.6, 1.7 horde-imp-kolab.spec, 1.18, 1.19 conf.php, 1.3, NONE servers.php, 1.3, NONE
- Next message: 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list