gunnar: server/horde/horde-turba ChangeLog, 1.6, 1.7 Makefile, 1.6, 1.7 horde-turba-kolab.spec, 1.22, 1.23 HK-GW-Fix_editing_contacts.patch, 1.1, NONE HK-GW-Fix_share_id_change.patch, 1.1, NONE HK-GW-Ldap_read_only_fix.patch, 1.1, NONE conf.php, 1.2, NONE sources.php, 1.5, NONE
cvs at kolab.org
cvs at kolab.org
Fri Mar 14 18:28:04 CET 2008
- Previous message: gunnar: server/horde/horde-passwd ChangeLog, 1.4, 1.5 Makefile, 1.6, 1.7 horde-passwd-kolab.spec, 1.15, 1.16 backends.php, 1.1, NONE conf.php, 1.1, NONE
- Next message: wilde: server/php-kolab/Kolab_Filter/Filter Resource.php,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/horde/horde-turba
In directory doto:/tmp/cvs-serv23799/horde-turba
Modified Files:
ChangeLog Makefile horde-turba-kolab.spec
Removed Files:
HK-GW-Fix_editing_contacts.patch
HK-GW-Fix_share_id_change.patch HK-GW-Ldap_read_only_fix.patch
conf.php sources.php
Log Message:
A first commit of the restructured Horde packages. Not finished yet.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog 29 Nov 2007 08:25:53 -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-turba-kolab.spec: Update to RC2
+
2007-11-29 Gunnar Wrobel <p at rdus.de>
* horde-turba-kolab.spec: Update to RC1
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile 1 Oct 2007 15:47:20 -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-turba-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-turba/horde-turba-kolab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- horde-turba-kolab.spec 29 Nov 2007 15:32:11 -0000 1.22
+++ horde-turba-kolab.spec 14 Mar 2008 17:28:02 -0000 1.23
@@ -1,11 +1,11 @@
# Versions
%define V_horde_name turba
%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_rc3
+%define V_uver 2.2-rc3
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -23,13 +23,12 @@
# List of Sources
Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
-Source1: conf.php
-Source2: sources.php
# List of Patches
-Patch0: HK-GW-Fix_share_id_change.patch
-Patch1: HK-GW-Fix_editing_contacts.patch
-Patch2: HK-GW-Ldap_read_only_fix.patch
+Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Config_turba-3.2-rc2.patch
+Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Fix_editing_contacts_turba-3.2-rc2.patch
+Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Fix_share_id_change_turba-3.2-rc2.patch
+Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/turba-3.2-rc2/HK-GW-Ldap_read_only_fix_turba-3.2-rc2.patch
# Build Info
Prefix: %{l_prefix}
@@ -66,6 +65,7 @@
%patch -p2 -P 0
%patch -p2 -P 1
%patch -p2 -P 2
+ %patch -p2 -P 3
cd ..
%build
@@ -78,19 +78,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} %{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} \
'%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/sources.php
+ '%config(noreplace)' %{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/*.php
%clean
rm -rf $RPM_BUILD_ROOT
--- HK-GW-Fix_editing_contacts.patch DELETED ---
--- HK-GW-Fix_share_id_change.patch DELETED ---
--- HK-GW-Ldap_read_only_fix.patch DELETED ---
--- conf.php DELETED ---
--- sources.php DELETED ---
- Previous message: gunnar: server/horde/horde-passwd ChangeLog, 1.4, 1.5 Makefile, 1.6, 1.7 horde-passwd-kolab.spec, 1.15, 1.16 backends.php, 1.1, NONE conf.php, 1.1, NONE
- Next message: wilde: server/php-kolab/Kolab_Filter/Filter Resource.php,1.8,1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list