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

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed May 18 18:20:02 CEST 2011


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

New commits:
commit 2bc45db8e8b4c7f497e802a0f25b8db67135e5c1
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Wed May 18 12:19:04 2011 -0400

    Check in new snapshot

diff --git a/.gitignore b/.gitignore
index 040a1e3..b191110 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.6-svn4734.tar.gz
 /roundcubemail-0.6-svn4768.tar.gz
 /kolab_folders.tgz
+/roundcubemail-0.6-svn4787.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index ec88d12..d6a3e66 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,4 +1,4 @@
-%global svnrevision 4768
+%global svnrevision 4787
 %global calendar_version 0.2.0
 
 %define roundcubedir %{_datadir}/roundcubemail
@@ -9,8 +9,7 @@
 
 Name: roundcubemail
 Version:  0.6
-# 0.8 not yet released
-Release:  0.9.%{?svnrevision_suffix}%{?dist}
+Release:  0.10.%{?svnrevision_suffix}%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -27,7 +26,6 @@ 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
@@ -71,7 +69,7 @@ Requires: php-pear-Kolab-Storage
 This package provides the Kolab plugins for Roundcube
 
 %prep
-%setup -q -n %{name}-%{version}%{?_svnrevision_suffix} -b100 -b101
+%setup -q -n %{name}-%{version}%{?_svnrevision_suffix} -b100
 
 %patch5 -p0
 %patch6 -p0
@@ -132,6 +130,12 @@ mv %{buildroot}%{roundcubedir}/config/main.inc.php.dist %{buildroot}%{_sysconfdi
 # keep any other config files too
 mv %{buildroot}%{roundcubedir}/config/* %{buildroot}%{_sysconfdir}/roundcubemail/
 
+mv %{buildroot}%{roundcubedir}/plugins/acl/config.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/acl.inc.php
+rm -rf %{buildroot}%{roundcubedir}/plugins/acl/config.inc.php
+pushd %{buildroot}%{roundcubedir}/plugins/acl/
+ln -s ../../../../..%{_sysconfdir}/roundcubemail/acl.inc.php config.inc.php
+popd
+
 # Do the same for kolab plugins
 mv %{buildroot}%{roundcubedir}/plugins/kolab_core/config.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/kolab.inc.php
 pushd %{buildroot}%{roundcubedir}/plugins/kolab_core/
@@ -187,9 +191,11 @@ exit 0
 %doc SQL
 %doc roundcubemail-README.fedora
 %exclude %{roundcubedir}/plugins/kolab_addressbook
+%exclude %{roundcubedir}/plugins/kolab_folders
 %exclude %{roundcubedir}/plugins/kolab_core
 %{roundcubedir}
 %dir %{_sysconfdir}/%{name}
+%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/acl.inc.php
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/db.inc.php
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/main.inc.php
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/managesieve.inc.php
@@ -206,7 +212,7 @@ exit 0
 %{roundcubedir}/plugins/kolab_folders
 
 %changelog
-* Sat May 14 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.9
+* Wed May 18 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.10
 - Fix ID
 - Fix permission typo
 - Remove Net/IDNA2 plugin
diff --git a/sources b/sources
index 9933892..0d8c350 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 0a78327a115563726356446855eefd88  roundcube-calendar.tar.gz
-12974c98d55d9c250541996989ea4f99  roundcubemail-0.6-svn4768.tar.gz
-0fd57443fa680855f36d91b3e6137c32  kolab_folders.tgz
+b0609c34f810e8f0787319a468cb8812  roundcubemail-0.6-svn4787.tar.gz




More information about the packaging-commits mailing list