[packaging] Branch 'el5/feature-kolab-2.4' - .gitignore roundcubemail.spec sources

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sat May 14 20:58:40 CEST 2011


 .gitignore         |    1 +
 roundcubemail.spec |    9 ++++++---
 sources            |    1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b4aee24428f9589b9bce93e7512797e2745cdc7d
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sat May 14 14:57:31 2011 -0400

    Add kolab_folders plugin

diff --git a/.gitignore b/.gitignore
index efe9392..040a1e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.6svn4734.tar.gz
 /roundcubemail-0.6-svn4734.tar.gz
 /roundcubemail-0.6-svn4768.tar.gz
+/kolab_folders.tgz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index ea27b9b..ec88d12 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -10,7 +10,7 @@
 Name: roundcubemail
 Version:  0.6
 # 0.8 not yet released
-Release:  0.8.%{?svnrevision_suffix}%{?dist}
+Release:  0.9.%{?svnrevision_suffix}%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -27,6 +27,7 @@ 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
+Source101: kolab_folders.tgz
 Patch5: roundcubemail-0.5.1-CVE-2010-0464.patch
 Patch6: roundcubemail-0.4.1-confpath.patch
 Patch7: roundcubemail-0.4.1-pg-mdb2.patch
@@ -70,7 +71,7 @@ Requires: php-pear-Kolab-Storage
 This package provides the Kolab plugins for Roundcube
 
 %prep
-%setup -q -n %{name}-%{version}%{?_svnrevision_suffix} -b100
+%setup -q -n %{name}-%{version}%{?_svnrevision_suffix} -b100 -b101
 
 %patch5 -p0
 %patch6 -p0
@@ -95,6 +96,7 @@ sed -i '/sqlite/d' config/db.inc.php.dist
 sed -i 's/\r//' SQL/mssql.initial.sql
 
 mv ../roundcube-calendar-%{calendar_version}/calendar plugins/.
+mv ../kolab_folders plugins/.
 
 %build
 
@@ -201,9 +203,10 @@ exit 0
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/kolab.inc.php
 %{roundcubedir}/plugins/kolab_addressbook
 %{roundcubedir}/plugins/kolab_core
+%{roundcubedir}/plugins/kolab_folders
 
 %changelog
-* Sat May 14 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.8
+* Sat May 14 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.9
 - Fix ID
 - Fix permission typo
 - Remove Net/IDNA2 plugin
diff --git a/sources b/sources
index b471dea..9933892 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 0a78327a115563726356446855eefd88  roundcube-calendar.tar.gz
 12974c98d55d9c250541996989ea4f99  roundcubemail-0.6-svn4768.tar.gz
+0fd57443fa680855f36d91b3e6137c32  kolab_folders.tgz




More information about the packaging-commits mailing list