[Kolab-devel] Branch '2.3-stable' - 2 commits - kolabd/kolabd.spec release-notes.txt

[Gunnar Wrobel]

Quoting Christoph Wickert <wickert at kolabsys.com>:

> kolabd/kolabd.spec |    6 +++---
>  release-notes.txt  |   12 ------------
>  2 files changed, 3 insertions(+), 15 deletions(-)
>
> New commits:
> commit 0e8e44b895887ae349f3db9dadb3af36e390670c
> Author: Christoph Wickert <wickert at kolabsys.com>
> Date:   Tue Sep 13 19:04:15 2011 +0200
>
>     Revert "Require the PHP filter module."
>
>     This reverts commit a59de23c20253f613ac55edc4293798f96f8928d because
>     it should never have happened in 2.3-stable but in the 'horde4' branch.

*Absolutely not*. Why has this been reverted without further communication?

Cheers,

Gunnar

>
> diff --git a/kolabd/kolabd.spec b/kolabd/kolabd.spec
> index 66aeeea..fa4c29a 100644
> --- a/kolabd/kolabd.spec
> +++ b/kolabd/kolabd.spec
> @@ -34,7 +34,7 @@ Distribution: OpenPKG
>  Group:        Mail
>  License:      GPL
>  Version:      2.3.2
> -Release:      20110912
> +Release:      20110531
>
>  #   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, 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:       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:       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 42debd7ed8a99e17328fbbd569e5fa43c8397d38
> Author: Christoph Wickert <wickert at kolabsys.com>
> Date:   Tue Sep 13 19:02:01 2011 +0200
>
>     Revert "Activated the PHP filter module"
>
>     This reverts commit 4b7118dd73fbf0b46ff405060915c4ac2f46c66e because
>     it should not have happened in 2.3-stable but in the 'horde4' branch.
>
> diff --git a/release-notes.txt b/release-notes.txt
> index a9a28a2..ce0924a 100644
> --- a/release-notes.txt
> +++ b/release-notes.txt
> @@ -8,10 +8,6 @@ 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)
> @@ -27,18 +23,10 @@ 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
>
>
> _______________________________________________
> kolab-commits mailing list
> kolab-commits at kolab.org
> https://kolab.org/mailman/listinfo/kolab-commits

-- 
Core Developer
The Horde Project

e: wrobel at horde.org
t: +49 700 6245 0000
w: http://www.horde.org

pgp: 9703 43BE
tweets: http://twitter.com/pardus_de
blog: http://log.pardus.de