gunnar: server/horde/horde ChangeLog, 1.5, 1.6 Makefile, 1.14, 1.15 horde-kolab.spec, 1.24, 1.25 conf.php, 1.11, NONE hooks.php, 1.1, NONE registry.php, 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-dimp .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 Makefile, NONE, 1.1 horde-dimp-kolab.spec, NONE, 1.1
- Next message: gunnar: server/horde/horde-mimp .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 Makefile, NONE, 1.1 horde-mimp-kolab.spec, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv23799/horde
Modified Files:
ChangeLog Makefile horde-kolab.spec
Removed Files:
conf.php hooks.php registry.php
Log Message:
A first commit of the restructured Horde packages. Not finished yet.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/horde/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:00 -0000 1.6
@@ -1,3 +1,7 @@
+2008-02-26 Gunnar Wrobel <p at rdus.de>
+
+ * horde-kolab.spec: Update to RC2
+
2007-11-29 Gunnar Wrobel <p at rdus.de>
* horde-kolab.spec: Update to RC1
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile 1 Oct 2007 15:47:19 -0000 1.14
+++ Makefile 14 Mar 2008 17:28:00 -0000 1.15
@@ -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-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- horde-kolab.spec 1 Dec 2007 06:57:42 -0000 1.24
+++ horde-kolab.spec 14 Mar 2008 17:28:00 -0000 1.25
@@ -1,11 +1,11 @@
# Versions
%define V_horde_name horde
%define V_package %{V_horde_name}-kolab
-%define V_year 2007
-%define V_month 12
-%define V_day 01
-%define V_version 3.2_rc1
-%define V_uver 3.2-rc1
+%define V_year 2008
+%define V_month 02
+%define V_day 26
+%define V_version 3.2_rc2
+%define V_uver 3.2-rc2
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -24,7 +24,9 @@
# List of Sources
Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_uver}.tar.gz
Source1: horde-kolab-conf.template
-Source2: conf.php
+
+# List of Patches
+Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/horde-3.2-rc2/HK-GW-Config_horde-3.2-rc2.patch
# Build Info
Prefix: %{l_prefix}
@@ -63,6 +65,7 @@
%setup -c -q -n %{V_horde_name}-%{V_uver}
cd %{V_horde_name}-%{V_uver}
+ %patch -p2 -P 0
cd ..
%build
@@ -78,7 +81,9 @@
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
rm -rf lib/{File,File.php,Horde,Horde.php,Net,SyncML,SyncML.php,Text,VFS,VFS.php,XML}
@@ -89,15 +94,12 @@
%{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/config/
-
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/horde \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/horde \
'%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \
'%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/config/conf.php' \
- '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/conf.php'
+ '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/*.php'
%clean
rm -rf $RPM_BUILD_ROOT
--- conf.php DELETED ---
--- hooks.php DELETED ---
--- registry.php DELETED ---
- Previous message: gunnar: server/horde/horde-dimp .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 Makefile, NONE, 1.1 horde-dimp-kolab.spec, NONE, 1.1
- Next message: gunnar: server/horde/horde-mimp .cvsignore, NONE, 1.1 ChangeLog, NONE, 1.1 Makefile, NONE, 1.1 horde-mimp-kolab.spec, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list