summaryrefslogtreecommitdiff
path: root/php-kolab/Kolab_Filter
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2008-12-05 17:24:01 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2008-12-05 17:24:01 (GMT)
commitac53e76148bb691383d197e772bd97fe30b5c4a9 (patch)
treefe6ef8ef39d325205a2c5137c2e6df07c480e881 /php-kolab/Kolab_Filter
parentffcc8a829933c5afa03a967d623b6c874b6d9291 (diff)
downloadserver-ac53e76148bb691383d197e772bd97fe30b5c4a9.tar.gz
Update to Kolab_Filter-0.1.2.
Diffstat (limited to 'php-kolab/Kolab_Filter')
-rw-r--r--php-kolab/Kolab_Filter/Kolab_Filter.spec12
-rw-r--r--php-kolab/Kolab_Filter/Makefile3
2 files changed, 4 insertions, 11 deletions
diff --git a/php-kolab/Kolab_Filter/Kolab_Filter.spec b/php-kolab/Kolab_Filter/Kolab_Filter.spec
index 51b2b4e..2d2f87c 100644
--- a/php-kolab/Kolab_Filter/Kolab_Filter.spec
+++ b/php-kolab/Kolab_Filter/Kolab_Filter.spec
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
-%define V_version 0.1.1
-%define V_release 20081125
+%define V_version 0.1.2
+%define V_release 20081205
# Package Information
Name: %{V_package}
@@ -16,10 +16,6 @@ Distribution: OpenPKG
# List of Sources
Source0: http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
-Source1: package.xml
-
-# List of patches
-Patch0: kolab-issue3260.patch
# Build Info
Prefix: %{l_prefix}
@@ -48,8 +44,6 @@ resource management as well as some Kolab server sender policies.
%prep
%setup -n %{V_package}-%{V_version}
- %patch -p1 -P 0
- cp %{S:1} .
%build
@@ -59,7 +53,7 @@ resource management as well as some Kolab server sender policies.
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 install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
+ %{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
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
diff --git a/php-kolab/Kolab_Filter/Makefile b/php-kolab/Kolab_Filter/Makefile
index 894e5a4..0cb4ffc 100644
--- a/php-kolab/Kolab_Filter/Makefile
+++ b/php-kolab/Kolab_Filter/Makefile
@@ -16,7 +16,6 @@ ifeq "x$(KOLABRPMTMP)" "x"
endif
SOURCE_0=http://pear.horde.org/get/$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog kolab-issue3260.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
@@ -35,7 +34,7 @@ $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec ChangeLog
test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
- cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
+ cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .