[packaging] Branch 'el5/feature-kolab-2.4' - 0001-ID-has-no-php-key.patch roundcubemail.spec

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri May 6 16:15:48 CEST 2011


 0001-ID-has-no-php-key.patch |   13 +++++++++++++
 roundcubemail.spec           |   23 ++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

New commits:
commit 33c29fb2a007c523328e043b33686be4f4523df8
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Fri May 6 10:14:44 2011 -0400

    Patch the ID header

diff --git a/0001-ID-has-no-php-key.patch b/0001-ID-has-no-php-key.patch
new file mode 100644
index 0000000..61924f7
--- /dev/null
+++ b/0001-ID-has-no-php-key.patch
@@ -0,0 +1,13 @@
+diff -ur roundcubemail-0.6-svn4734/program/include/rcube_imap.php roundcubemail-0.6-svn4734.ID/program/include/rcube_imap.php
+--- roundcubemail-0.6-svn4734/program/include/rcube_imap.php	2011-05-05 08:46:54.000000000 -0400
++++ roundcubemail-0.6-svn4734.ID/program/include/rcube_imap.php	2011-05-05 14:43:13.850627096 -0400
+@@ -153,8 +153,7 @@
+ 
+             $this->options['ident'] = array(
+                 'name' => 'Roundcube Webmail',
+-                'version' => RCMAIL_VERSION,
+-                'php' => PHP_VERSION,
++                'version' => RCMAIL_VERSION .' php-'. PHP_VERSION,
+                 'os' => PHP_OS,
+                 'command' => $_SERVER['REQUEST_URI'],
+             );
diff --git a/roundcubemail.spec b/roundcubemail.spec
index ca93faa..74a65b6 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -9,8 +9,8 @@
 
 Name: roundcubemail
 Version:  0.6
-# 0.7 not yet released
-Release:  0.7.%{?svnrevision_suffix}%{?dist}
+# 0.8 not yet released
+Release:  0.8.%{?svnrevision_suffix}%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -27,17 +27,12 @@ Source4: roundcubemail-README.fedora
 # From git://github.com/duelli/roundcube-calendar.git
 # git archive HEAD --prefix=roundcube-calendar-0.2.0/ | gzip -c > roundcube-calendar.tar.gz
 Source100: roundcube-calendar.tar.gz
-#Patch0: roundcubemail-0.2-beta-confpath.patch
-# From upstream, not in a release yet, BZ 476223.
-#Patch1: roundcubemail-0.2-beta-html2text.patch
-# From upstream, not in a release yet, BZ 476830.
-#Patch2: roundcubemail-0.2-beta-CVE-2008-5620.patch
-#Patch3: roundcubemail-0.2-CVE-2009-0413.patch
-#Patch4: roundcubemail-0.2-stable-pg-mdb2.patch
 Patch5: roundcubemail-0.5.1-CVE-2010-0464.patch
 Patch6: roundcubemail-0.4.1-confpath.patch
 Patch7: roundcubemail-0.4.1-pg-mdb2.patch
 
+Patch100: 0001-ID-has-no-php-key.patch
+
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 Requires: php-pear-Auth-SASL
@@ -77,15 +72,12 @@ This package provides the Kolab plugins for Roundcube
 %prep
 %setup -q -n %{name}-%{version}%{?_svnrevision_suffix} -b100
 
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p0
-#%patch3 -p0
-#%patch4 -p0
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
 
+%patch100 -p1
+
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
 find . -name \.htaccess -print | xargs rm -f
@@ -211,7 +203,8 @@ exit 0
 %{roundcubedir}/plugins/kolab_core
 
 %changelog
-* Wed Apr 20 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.7
+* Fri May 06 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.8
+- Fix ID
 - Fix permission typo
 - Remove Net/IDNA2 plugin
 - Fix manage sieve configuration




More information about the packaging-commits mailing list