gunnar: server/horde/fbview-kronolith Makefile, 1.3, 1.4 fbview-kronolith.spec, 1.13, 1.14
cvs at kolab.org
cvs at kolab.org
Mon Oct 1 17:47:21 CEST 2007
Author: gunnar
Update of /kolabrepository/server/horde/fbview-kronolith
In directory doto:/tmp/cvs-serv20832/horde/fbview-kronolith
Modified Files:
Makefile fbview-kronolith.spec
Log Message:
Moving the horde packages to the latest ALPHA release.
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 2 Aug 2007 12:27:34 -0000 1.3
+++ Makefile 1 Oct 2007 15:47:19 -0000 1.4
@@ -19,15 +19,16 @@
DATE = ${YEAR}-${MONTH}-${DAY}
PACKAGE = fbview-$(HORDE_NAME)
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
+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") savedattlist.inc open_savedattlist_win.js
TEMPLATES = $(shell find . -name "*.template")
CONFIGS = $(shell find . -name "*.php")
-PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
-SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
+PACKAGE_0=$(HORDE_NAME)-h3-$(UVER).tar.gz
+SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -42,7 +43,7 @@
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 $(PATCHES) $(TEMPLATES) $(CONFIGS) ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
Index: fbview-kronolith.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-kronolith/fbview-kronolith.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- fbview-kronolith.spec 13 Sep 2007 13:43:54 -0000 1.13
+++ fbview-kronolith.spec 1 Oct 2007 15:47:19 -0000 1.14
@@ -2,9 +2,10 @@
%define V_horde_name kronolith
%define V_package fbview-%{V_horde_name}
%define V_year 2007
-%define V_month 09
-%define V_day 12
-%define V_version 2.1.5.99
+%define V_month 10
+%define V_day 01
+%define V_version 2.2_alpha
+%define V_uver 2.2-alpha
%define V_date %{V_year}-%{V_month}-%{V_day}
%define V_release %{V_year}%{V_month}%{V_day}
@@ -21,7 +22,7 @@
Distribution: OpenPKG
# List of Sources
-Source0: http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
+Source0: http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-h3-%{V_uver}.tar.gz
Source1: fbview-kronolith-conf.template
Source2: conf.php
Source3: prefs.php
@@ -63,9 +64,9 @@
of the Horde Framework to provide integration with other applications.
%prep
- %setup -c -q
+ %setup -c -q -n %{V_horde_name}-h3-%{V_uver}
- cd %{V_horde_name}
+ cd %{V_horde_name}-h3-%{V_uver}
%patch -p0 -P 0
cd ..
@@ -75,17 +76,20 @@
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
- # Copy the dist configs into the real configuration files
- cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
+ cd %{V_horde_name}-h3-%{V_uver}
+
+ cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
# Remove some stuff not necessary for fbview
- cd %{V_horde_name} && rm add.php calendars.php day.php perms.php view.php \
- delete.php ics.php search.php week.php contacts.php \
- imple.php month.php pref_api.php workweek.php \
- edit.php new.php test.php year.php attend.php \
- data.php event.php && cd ..
+ rm add.php calendars.php day.php perms.php view.php \
+ delete.php ics.php search.php week.php contacts.php \
+ imple.php month.php pref_api.php workweek.php \
+ edit.php new.php test.php year.php attend.php \
+ data.php event.php
- cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/
+ cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/
+
+ cd ..
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/fbview/%{V_horde_name}/templates/savedattlist
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} \
More information about the commits
mailing list