gunnar: server/php-kolab/Kolab_Filter ChangeLog, 1.29, 1.30 Kolab_Filter.spec, 1.19, 1.20 Makefile, 1.8, 1.9 issue3192.patch, 1.1, NONE issue3435.patch, 1.1, NONE issue3441.patch, 1.1, NONE package.xml, 1.5, NONE
cvs at kolab.org
cvs at kolab.org
Fri Mar 6 10:17:10 CET 2009
Author: gunnar
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv11797/php-kolab/Kolab_Filter
Modified Files:
ChangeLog Kolab_Filter.spec Makefile
Removed Files:
issue3192.patch issue3435.patch issue3441.patch package.xml
Log Message:
Kolab_Filter-0.1.5
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog 3 Mar 2009 16:25:07 -0000 1.29
+++ ChangeLog 6 Mar 2009 09:17:05 -0000 1.30
@@ -1,3 +1,7 @@
+2009-03-06 Gunnar Wrobel <p at rdus.de>
+
+ * Kolab_Filter.spec: Update to 0.1.5.
+
2009-03-03 Thomas Arendsen Hein <thomas at intevation.de>
* issue3192.patch, issue3441.patch, Kolab_Filter.spec, Makefile: Add
Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Kolab_Filter.spec 3 Mar 2009 16:25:07 -0000 1.19
+++ Kolab_Filter.spec 6 Mar 2009 09:17:05 -0000 1.20
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
-%define V_version 0.1.4
-%define V_release 20090303
+%define V_version 0.1.5
+%define V_release 20090306
# Package Information
Name: %{V_package}
@@ -16,12 +16,9 @@
# List of Sources
Source0: http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
-Source1: package.xml
# List of patches
-Patch0: issue3435.patch
-Patch1: issue3192.patch
-Patch2: issue3441.patch
+#Patch0: issueXYZ.patch
# Build Info
Prefix: %{l_prefix}
@@ -56,24 +53,24 @@
%prep
%setup -n %{V_package}-%{V_version}
- %patch -p3 -P 0
- %patch -p1 -P 1
- %patch -p1 -P 2
- cp %{S:1} .
+# %patch -p1 -P 0
+
+ cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
%build
%install
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/log
+ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/locks
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab-filter/tmp
%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/man/man1
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
-# %{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/freebusy" install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
%{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
cp $RPM_BUILD_ROOT/%{l_prefix}/lib/php/doc/Kolab_Filter/man/man1/kolabfilter.1 $RPM_BUILD_ROOT/%{l_prefix}/man/man1
+ cd $RPM_BUILD_ROOT/%{l_prefix}/man/man1 && ln -s kolabfilter.1 kolabmailboxfilter.1 && cd -
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
%dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab-filter/tmp \
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile 3 Mar 2009 16:25:07 -0000 1.8
+++ Makefile 6 Mar 2009 09:17:05 -0000 1.9
@@ -1,6 +1,7 @@
PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([A-Za-z\-\_]*\).*/\1/")
VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
+PATCHES = $(shell ls *.patch)
ifeq "x$(RPM)" "x"
RPM = $(HOME)/bin/openpkg rpm
@@ -21,7 +22,7 @@
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3435.patch issue3192.patch issue3441.patch package.xml
+EXTRA=ChangeLog $(PATCHES)
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
--- issue3192.patch DELETED ---
--- issue3435.patch DELETED ---
--- issue3441.patch DELETED ---
--- package.xml DELETED ---
More information about the commits
mailing list