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

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed May 18 19:12:46 CEST 2011


 roundcubemail.spec |    4 +++-
 sources            |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d2e8c93a2e550857057a2c4449c9fde07f4d3da1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 18 13:11:48 2011 -0400

    Add back kolab_folders

diff --git a/roundcubemail.spec b/roundcubemail.spec
index d6a3e66..f218b7e 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -26,6 +26,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.tar.gz
 Patch5: roundcubemail-0.5.1-CVE-2010-0464.patch
 Patch6: roundcubemail-0.4.1-confpath.patch
 Patch7: roundcubemail-0.4.1-pg-mdb2.patch
@@ -69,7 +70,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
diff --git a/sources b/sources
index 0d8c350..0743a92 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 0a78327a115563726356446855eefd88  roundcube-calendar.tar.gz
+0fd57443fa680855f36d91b3e6137c32  kolab_folders.tgz
 b0609c34f810e8f0787319a468cb8812  roundcubemail-0.6-svn4787.tar.gz


commit ebfc3961696a491b4069b1b288ac8a3b98978068
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 18 13:10:08 2011 -0400

    Revert "Fix mv kolab_folders"
    
    This reverts commit c3155831d203f0a11abeefc9bbc324c853e85155.

diff --git a/roundcubemail.spec b/roundcubemail.spec
index 03999bf..d6a3e66 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -94,6 +94,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
 




More information about the packaging-commits mailing list