gunnar: server/horde/fbview-horde ChangeLog, 1.2, 1.3 Makefile, 1.3, 1.4 fbview-horde.spec, 1.17, 1.18 conf.php, 1.9, NONE prefs.php, 1.1, NONE
cvs at kolab.org
cvs at kolab.org
Fri Mar 14 18:28:02 CET 2008
- Previous message: gunnar: server/horde/horde-dimp - New directory
- Next message: gunnar: server/horde/fbview-kronolith ChangeLog, 1.2, 1.3 Makefile, 1.5, 1.6 fbview-kronolith.spec, 1.19, 1.20 HK-GW-Fbview_menu.patch, 1.1, NONE 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 prefs.php, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gunnar
Update of /kolabrepository/server/horde/fbview-horde
In directory doto:/tmp/cvs-serv23799/fbview-horde
Modified Files:
ChangeLog Makefile fbview-horde.spec
Removed Files:
conf.php prefs.php
Log Message:
A first commit of the restructured Horde packages. Not finished yet.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog 29 Nov 2007 08:25:51 -0000 1.2
+++ ChangeLog 14 Mar 2008 17:28:00 -0000 1.3
@@ -1,3 +1,7 @@
+2008-02-26 Gunnar Wrobel <p at rdus.de>
+
+ * fbview-horde.spec: Update to RC2
+
2007-11-29 Gunnar Wrobel <p at rdus.de>
* fbview-horde.spec: Update to RC1
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 1 Oct 2007 15:47:19 -0000 1.3
+++ Makefile 14 Mar 2008 17:28:00 -0000 1.4
@@ -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: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- fbview-horde.spec 1 Dec 2007 06:57:42 -0000 1.17
+++ fbview-horde.spec 14 Mar 2008 17:28:00 -0000 1.18
@@ -1,11 +1,11 @@
# Versions
%define V_horde_name horde
%define V_package fbview-%{V_horde_name}
-%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,8 +24,9 @@
# List of Sources
Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_uver}.tar.gz
Source1: fbview-horde-conf.template
-Source2: conf.php
-Source3: prefs.php
+
+# List of Patches
+Patch0: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde/fbview-horde-3.2-rc2/HK-GW-Config_fbview-horde-3.2-rc2.patch
# Build Info
Prefix: %{l_prefix}
@@ -61,6 +62,10 @@
%prep
%setup -c -q -n %{V_horde_name}-%{V_uver}
+ cd %{V_horde_name}-%{V_uver}
+ %patch -p2 -P 0
+ cd ..
+
%build
%install
@@ -75,7 +80,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}
@@ -85,17 +92,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} %{S:3} \
- $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/config/
-
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/fbview \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/fbview \
'%config(noreplace) %{l_prefix}/etc/kolab/templates/fbview-horde-conf.template' \
'%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \
- '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/conf.php' \
- '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/prefs.php'
+ '%config(noreplace) %{l_prefix}/var/kolab/www/fbview/config/*.php'
%clean
rm -rf $RPM_BUILD_ROOT
--- conf.php DELETED ---
--- prefs.php DELETED ---
- Previous message: gunnar: server/horde/horde-dimp - New directory
- Next message: gunnar: server/horde/fbview-kronolith ChangeLog, 1.2, 1.3 Makefile, 1.5, 1.6 fbview-kronolith.spec, 1.19, 1.20 HK-GW-Fbview_menu.patch, 1.1, NONE 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 prefs.php, 1.3, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the commits
mailing list