Branch '2.3-stable' - 4 commits - apache-php/apache-php.spec apache-php/Makefile kolabd/kolabd.spec php/Makefile php/php.spec release-notes.txt
Gunnar Wrobel
wrobel at kolabsys.com
Mon Sep 12 10:25:55 CEST 2011
apache-php/Makefile | 2 +-
apache-php/apache-php.spec | 8 +++++++-
kolabd/kolabd.spec | 6 +++---
php/Makefile | 2 +-
php/php.spec | 8 +++++++-
release-notes.txt | 12 ++++++++++++
6 files changed, 31 insertions(+), 7 deletions(-)
New commits:
commit 4b7118dd73fbf0b46ff405060915c4ac2f46c66e
Author: Gunnar Wrobel <p at rdus.de>
Date: Mon Sep 12 08:25:44 2011 +0000
Activated the PHP filter module.
diff --git a/release-notes.txt b/release-notes.txt
index ce0924a..a9a28a2 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -8,6 +8,10 @@ the 1st.README file in the package directory.
Changes between 2.3.2 and 2.3-?:
+ - apache-php-5.3.6-20110912
+
+ Activated the filter module.
+
- dimp-1.1.6-20110831
kolab/issue4743 ([DIMP] [v2.3.2] Mail blank in frame but displays fine in new window)
@@ -23,10 +27,18 @@ the 1st.README file in the package directory.
kolab/issue4690 (Umlaut problems in system folders)
+ - kolabd-2.3.2-20110912
+
+ Require the filter module in both php and apache-php.
+
- kronolith-2.3.5-20110912
Fix the F/B list of the organizer in the event attendee view.
+ - php-5.3.6-20110912
+
+ Activated the filter module.
+
- turba-2.3.5-20110912
Display the organizationalUnit (ou) as "department" within the
commit a59de23c20253f613ac55edc4293798f96f8928d
Author: Gunnar Wrobel <p at rdus.de>
Date: Mon Sep 12 08:25:41 2011 +0000
Require the PHP filter module.
diff --git a/kolabd/kolabd.spec b/kolabd/kolabd.spec
index fa4c29a..66aeeea 100644
--- a/kolabd/kolabd.spec
+++ b/kolabd/kolabd.spec
@@ -34,7 +34,7 @@ Distribution: OpenPKG
Group: Mail
License: GPL
Version: 2.3.2
-Release: 20110531
+Release: 20110912
# list of sources
Source0: kolabd-%{version}.tar.bz2
@@ -57,8 +57,8 @@ PreReq: Kolab_Filter
PreReq: Kolab_FreeBusy
# what about php::with_tidy = yes (for Horde Imp)
-PreReq: php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_json = yes, php::with_tokenizer = yes, php::with_simplexml = yes
-PreReq: apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes, apache-php::with_simplexml = yes
+PreReq: php, php::with_gettext = yes, php::with_dom = yes, php::with_mcrypt = yes, php::with_iconv = yes, php::with_mbstring = yes, php::with_mbregex = yes, php::with_gd = yes, php::with_imap = yes, php::with_ssl = yes, php::with_ctype = yes, php::with_openldap = yes, php::with_hash = yes, php::with_zlib = yes, php::with_bdb = yes, php::with_imap_annotate = yes, php::with_imap_myrights = yes, php::with_pear = yes, php::with_xml = yes, php::with_mm = yes, php::with_sqlite = yes, php::with_json = yes, php::with_tokenizer = yes, php::with_simplexml = yes, php::with_filter
+PreReq: apache-php, apache-php::with_gettext = yes, apache-php::with_dom = yes, apache-php::with_mcrypt = yes, apache-php::with_iconv = yes, apache-php::with_mbstring = yes, apache-php::with_mbregex = yes, apache-php::with_gd = yes, apache-php::with_imap = yes, apache-php::with_ssl = yes, apache-php::with_ctype = yes, apache-php::with_openldap = yes, apache-php::with_hash = yes, apache-php::with_zlib = yes, apache-php::with_bdb = yes, apache-php::with_imap_annotate = yes, apache-php::with_imap_myrights = yes, apache-php::with_pear = yes, apache-php::with_xml = yes, apache-php::with_mm = yes, apache-php::with_sqlite = yes, apache-php::with_json = yes, apache-php::with_tokenizer = yes, apache-php::with_simplexml = yes, apache-php::with_filter = yes
PreReq: imapd, imapd::with_group = yes, imapd::with_group_igncase = yes, imapd::with_ldap = yes, imapd::with_annotate = yes, imapd::with_atvdom = yes, imapd::with_morelogging = yes, imapd::with_kolab = yes
PreReq: perl-ssl
commit 718fdfcc47f2060d9e297cde3fc845fe9970296f
Author: Gunnar Wrobel <p at rdus.de>
Date: Mon Sep 12 08:25:26 2011 +0000
Activated the PHP filter module.
diff --git a/php/Makefile b/php/Makefile
index 94b73ff..c4f2076 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -20,7 +20,7 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \
--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
--define 'with_simplexml yes' --define 'with_sqlite yes' --define 'with_spl yes' \
- --define 'with_json yes' --define 'with_tokenizer yes'
+ --define 'with_json yes' --define 'with_tokenizer yes' --define 'with_filter yes'
include ../make-helper/package.mk
include ../make-helper/package-new.mk
diff --git a/php/php.spec b/php/php.spec
index 83e8863..476e466 100644
--- a/php/php.spec
+++ b/php/php.spec
@@ -32,7 +32,7 @@ Class: BASE
Group: Language
License: PHP
Version: 5.3.6
-Release: 20110601
+Release: 20110912
# package options
%option with_bc no
@@ -44,6 +44,7 @@ Release: 20110601
%option with_debug no
%option with_dom no
%option with_exif no
+%option with_filter no
%option with_freetype no
%option with_ftp no
%option with_gd no
@@ -444,6 +445,11 @@ AutoReqProv: no
%else
--disable-tokenizer \
%endif
+%if "%{with_filter}" == "yes"
+ --enable-filter \
+%else
+ --disable-filter \
+%endif
%if "%{with_xml}" == "yes"
--enable-xml \
--enable-libxml \
commit 2f21a3746d726102a44ec38651e890cc68693b34
Author: Gunnar Wrobel <p at rdus.de>
Date: Mon Sep 12 08:25:12 2011 +0000
Activated the PHP filter module.
diff --git a/apache-php/Makefile b/apache-php/Makefile
index 64cf666..aeec690 100644
--- a/apache-php/Makefile
+++ b/apache-php/Makefile
@@ -20,7 +20,7 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \
--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
--define 'with_simplexml yes' --define 'with_sqlite yes' --define 'with_spl yes' \
- --define 'with_json yes' --define 'with_tokenizer yes'
+ --define 'with_json yes' --define 'with_tokenizer yes' --define 'with_filter yes'
include ../make-helper/package.mk
include ../make-helper/package-new.mk
diff --git a/apache-php/apache-php.spec b/apache-php/apache-php.spec
index 630724e..ab40c02 100644
--- a/apache-php/apache-php.spec
+++ b/apache-php/apache-php.spec
@@ -32,7 +32,7 @@ Class: BASE
Group: Web
License: PHP
Version: 5.3.6
-Release: 20110601
+Release: 20110912
# package options
%option with_bc no
@@ -44,6 +44,7 @@ Release: 20110601
%option with_debug no
%option with_dom no
%option with_exif no
+%option with_filter no
%option with_freetype no
%option with_ftp no
%option with_gd no
@@ -452,6 +453,11 @@ AutoReqProv: no
%else
--disable-tokenizer \
%endif
+%if "%{with_filter}" == "yes"
+ --enable-filter \
+%else
+ --disable-filter \
+%endif
%if "%{with_xml}" == "yes"
--enable-xml \
--enable-libxml \
More information about the commits
mailing list