apache-php/kolab.patch z-push/Makefile z-push/z-push.spec
Christoph Wickert
wickert at kolabsys.com
Fri Jan 21 15:22:48 CET 2011
apache-php/kolab.patch | 101 -------------------------------------------------
z-push/Makefile | 2
z-push/z-push.spec | 7 ++-
3 files changed, 6 insertions(+), 104 deletions(-)
New commits:
commit 1bd15618c4acaa0ddfeff3444394f0ecf559b3ee
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Fri Jan 21 15:22:41 2011 +0100
z-push: Update to 1.5. final
diff --git a/apache-php/kolab.patch b/apache-php/kolab.patch
deleted file mode 100644
index 613573d..0000000
--- a/apache-php/kolab.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- apache-php.orig/apache-php.spec 2009-11-29 19:41:05.000000000 +0100
-+++ apache-php/apache-php.spec 2011-01-11 09:35:19.768739148 +0100
-@@ -22,11 +22,11 @@
- ##
-
- # package versions
--%define V_php 5.3.1
--%define V_php_suhosin_p 5.3.1-0.9.8
--%define V_php_suhosin_e 0.9.29
--%define V_php_kolab 5.2.8
--%define V_php_pecl_memcache 2.2.5
-+%define V_php 5.3.4
-+%define V_php_suhosin_p 5.3.4-0.9.10
-+%define V_php_suhosin_e 0.9.32.1
-+%define V_php_kolab 5.3.4
-+%define V_php_pecl_memcache 2.2.6
-
- # package information
- Name: apache-php
-@@ -39,7 +39,7 @@
- Group: Web
- License: PHP
- Version: %{V_php}
--Release: 20091129
-+Release: 20101230_kolab1
-
- # package options
- %option with_suhosin no
-@@ -60,6 +60,8 @@
- %option with_iconv no
- %option with_imap no
- %option with_imap_annotate no
-+%option with_hash no
-+%option with_imap_myrights no
- %option with_json no
- %option with_tokenizer no
- %option with_mbregex no
-@@ -132,13 +134,14 @@
-
- # list of sources
- Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
--Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
-+Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tar.gz
- Source2: apache-php.ini
- Source3: apache-php.conf
- Source4: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
- Patch0: http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
--Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
-+Patch1: http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
- Patch2: apache-php.patch
-+Patch3: http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
-
- # build information
- Prefix: %{l_prefix}
-@@ -306,7 +309,7 @@
- }
- prog apache-php:kolab = {
- version = %{V_php_kolab}
-- url = http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/
-+ url = http://git.kolab.org/server/tree/php/patches/
- regex = php-(\d+(\.\d+)+)/
- }
- prog apache-php:pecl_memcache = {
-@@ -342,7 +345,10 @@
- configure \
- ext/gd/config.m4
- %if "%{with_imap_annotate}" == "yes"
-- sed <%{PATCH1} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1
-+ %patch -p1 -P 1
-+%endif
-+%if "%{with_imap_myrights}" == "yes"
-+ %patch -p1 -P 3
- %endif
- %patch -p0 -P 2
-
-@@ -404,11 +410,15 @@
- %if "%{with_calendar}" == "yes"
- --enable-calendar \
- %endif
-- --without-sqlite \
-+ %if "%{with_hash}" == "yes"
-+ --enable-hash \
-+ %endif
- %if "%{with_sqlite}" == "yes"
- --with-pdo-sqlite=%{l_prefix} \
-+ --with-sqlite=%{l_prefix} \
- %else
- --without-pdo-sqlite \
-+ --without-sqlite \
- %endif
- %if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
- %if "%{with_mysqlnd}" == "yes"
---- apache-php.orig/apache-php.conf 2007-06-22 23:29:41.000000000 +0200
-+++ apache-php/apache-php.conf 2011-01-11 09:22:53.551247984 +0100
-@@ -10,5 +10,5 @@
-
- # configure the PHP initialization file
- # (this directory directive really accepts a file, too!)
--PHPINIDir @l_prefix@/etc/apache/apache-php.ini
-+PHPINIDir @l_prefix@/etc/apache/php.ini
-
diff --git a/z-push/Makefile b/z-push/Makefile
index 9eecc8c..e431fe3 100644
--- a/z-push/Makefile
+++ b/z-push/Makefile
@@ -5,7 +5,7 @@ VERSION = $(shell grep "^Version:" *.spec | sed -e "s/^Version:\s*\([0-9.]*\).*/
RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9._a-z]*\).*/\1/")
SOURCE_URL=http://download.berlios.de/z-push/
-SOURCE_0=$(PACKAGE)-$(VERSION)beta2.tar.gz
+SOURCE_0=$(PACKAGE)-$(VERSION).tar.gz
EXTRA=z_RTF.php z-push.conf
include ../make-helper/package.mk
diff --git a/z-push/z-push.spec b/z-push/z-push.spec
index 37781ec..c0191c1 100644
--- a/z-push/z-push.spec
+++ b/z-push/z-push.spec
@@ -4,7 +4,7 @@
# Package Information
Name: z-push
Version: 1.5
-Release: 0.2.beta2
+Release: 1
Summary: Implementation of the ActiveSync protocol
# "Web" seems the most reasonable choice from
# /kolab/bin/openpkg rpm -qa --qf %{group}\\n | sort | uniq
@@ -16,7 +16,7 @@ Vendor: Kolab Systems AG <contact at kolabsys.com>
Distribution: OpenPKG
# List of Sources
-Source0: http://download.berlios.de/z-push/%{name}-%{version}%{?prerelease}.tar.gz
+Source0: http://download.berlios.de/z-push/%{name}-%{version}.tar.gz
Source1: https://kolabzpush.svn.sourceforge.net/svnroot/kolabzpush/tags/0.6.1/include/z_RTF.php
Source2: z-push.conf
@@ -89,6 +89,9 @@ chown kolab-n:kolab-n %{l_prefix}/var/kolab/www/z-push/state/ ||:
%changelog
+* Fri Jan 21 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-1
+- Update to 1.5 final
+
* Mon Dec 06 2010 Christoph Wickert <cwickert at fedoraproject.org> - 1.5-0.2.beta2
- Bump release for Kolab 2.3 alpha
More information about the commits
mailing list