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

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Mon Jun 6 16:32:03 CEST 2011


 .gitignore         |    2 +
 roundcubemail.spec |   83 ++++++++++++++++++++++++++++++++++++-----------------
 sources            |    5 +--
 3 files changed, 61 insertions(+), 29 deletions(-)

New commits:
commit 634e3196874ffdad13802bb0022f6b9acc64ec51
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jun 6 15:31:46 2011 +0100

    Check in new snapshot

diff --git a/.gitignore b/.gitignore
index b191110..5a85d8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.6-svn4768.tar.gz
 /kolab_folders.tgz
 /roundcubemail-0.6-svn4787.tar.gz
+/roundcubemail-0.6-svn4841.tar.gz
+/roundcubemail-plugins-0.6-2011060601.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index f369df3..f6a7caf 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,32 +1,39 @@
-%global svnrevision 4787
-%global calendar_version 0.2.0
+%global svnrevision 4841
+%global plugin_version 2011060601
 
 %define roundcubedir %{_datadir}/roundcubemail
-%global _logdir /var/log  
+%global _logdir /var/log
 
 %{?svnrevision: %global svnrevision_suffix svn%{svnrevision}}
 %{?svnrevision: %global _svnrevision_suffix -svn%{svnrevision}}
 
 Name: roundcubemail
 Version:  0.6
-Release:  0.10.%{?svnrevision_suffix}%{?dist}
+Release:  0.%{plugin_version}.%{?svnrevision_suffix}%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
-Group: Applications/System         
+Group: Applications/System
 License: GPLv2
 URL: http://www.roundcube.net
 # Created with svn export on trunk:
-# svn info https://svn.roundcube.net/trunk
-# svn export -r %{?svnrevision} https://svn.roundcube.net/trunk roundcube-0.6%{?_svnrevision_suffix}
+# svn info https://svn.roundcube.net/trunk/roundcubemail/
+# svn export -r %{?svnrevision} https://svn.roundcube.net/trunk/roundcubemail/ roundcubemail-%{version}-%{?_svnrevision_suffix}
 # tar czvf roundcube-0.6-svn%{?svnrevision}.tar.gz roundcube-0.6%{?_svnrevision_suffix}
 Source0: roundcubemail-%{version}%{?_svnrevision_suffix}.tar.gz
-Source1: roundcubemail.conf
-Source2: roundcubemail.logrotate
-Source4: roundcubemail-README.fedora
+# 1225  cd ~/tmp/
+# 1226  git clone ssh://vanmeeuwen@git.kolabsys.com/git/roundcube.git roundcube.git
+# 1227  cd roundcube.git/
+# 1228  git log
+# 1229  git archive HEAD --prefix=roundcubemail-plugins-0.6-2011060601/ | gzip -c > roundcubemail-plugins-0.6-2011060601.tar.gz
+# 1230  ll
+# 1231  tar zxvf roundcubemail-plugins-0.6-2011060601.tar.gz
+# 1232  cp roundcubemail-plugins-0.6-2011060601.tar.gz ~/devel/dist-git/roundcubemail/.
+Source1: roundcubemail-plugins-%{version}-%{plugin_version}.tar.gz
+Source10: roundcubemail.conf
+Source11: roundcubemail.logrotate
+Source12: 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
@@ -55,7 +62,7 @@ RoundCube Webmail is a browser-based multilingual IMAP client
 with an application-like user interface. It provides full
 functionality you expect from an e-mail client, including MIME
 support, address book, folder manipulation, message searching
-and spell checking. RoundCube Webmail is written in PHP and 
+and spell checking. RoundCube Webmail is written in PHP and
 requires the MySQL database or the PostgreSQL database. The user
 interface is fully skinnable using XHTML and CSS 2.
 
@@ -70,7 +77,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} -b1
 
 %patch5 -p0
 %patch6 -p0
@@ -94,8 +101,10 @@ sed -i 's|config/|%{_sysconfdir}/roundcubemail/|' program/include/main.inc
 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/.
+for plugin in calendar kolab_addressbook kolab_core kolab_folders; do
+    rm -rf plugins/$plugin
+    mv ../roundcubemail-plugins-%{version}-%{plugin_version}/plugins/$plugin plugins/.
+done
 
 %build
 
@@ -115,15 +124,16 @@ cp -pr ./* %{buildroot}%{roundcubedir}
 rm -rf %{buildroot}%{roundcubedir}/installer
 
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-cp -pr %SOURCE1 %{buildroot}%{_sysconfdir}/httpd/conf.d
+cp -pr %SOURCE10 %{buildroot}%{_sysconfdir}/httpd/conf.d
 
 mkdir -p %{buildroot}%{_sysconfdir}/roundcubemail
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
+cp -pr %SOURCE11 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail
 
+mkdir -p %{buildroot}/var/lib/roundcubemail/plugins/enigma
 mkdir -p %{buildroot}/var/log/roundcubemail
 
-cp -pr %SOURCE4 .
+cp -pr %SOURCE12 .
 
 # use dist files as config files
 mv %{buildroot}%{roundcubedir}/config/db.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/db.inc.php
@@ -131,18 +141,33 @@ mv %{buildroot}%{roundcubedir}/config/main.inc.php.dist %{buildroot}%{_sysconfdi
 # keep any other config files too
 mv %{buildroot}%{roundcubedir}/config/* %{buildroot}%{_sysconfdir}/roundcubemail/
 
+# Enigma
+pushd %{buildroot}%{roundcubedir}/plugins/enigma
+rm -rf home/
+ln -s ../../../../var/lib/roundcubemail/plugins/enigma home
+popd
+
+# ACL plugin
 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
+# Calendar
+mv %{buildroot}%{roundcubedir}/plugins/calendar/config.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/calendar.inc.php
+rm -rf %{buildroot}%{roundcubedir}/plugins/calendar/config.inc.php
+pushd %{buildroot}%{roundcubedir}/plugins/calendar/
+ln -s ../../../../..%{_sysconfdir}/roundcubemail/calendar.inc.php config.inc.php
+popd
+
+# Kolab core plugin
 mv %{buildroot}%{roundcubedir}/plugins/kolab_core/config.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/kolab.inc.php
 pushd %{buildroot}%{roundcubedir}/plugins/kolab_core/
 ln -s ../../../../..%{_sysconfdir}/roundcubemail/kolab.inc.php config.inc.php
 popd
 
+# Managesieve plugin
 mv %{buildroot}%{roundcubedir}/plugins/managesieve/config.inc.php.dist %{buildroot}%{_sysconfdir}/roundcubemail/managesieve.inc.php
 pushd %{buildroot}%{roundcubedir}/plugins/managesieve/
 ln -s ../../../../..%{_sysconfdir}/roundcubemail/managesieve.inc.php config.inc.php
@@ -191,29 +216,35 @@ exit 0
 %doc UPGRADING
 %doc SQL
 %doc roundcubemail-README.fedora
+%exclude %{roundcubedir}/plugins/calendar
 %exclude %{roundcubedir}/plugins/kolab_addressbook
-%exclude %{roundcubedir}/plugins/kolab_folders
 %exclude %{roundcubedir}/plugins/kolab_core
+%exclude %{roundcubedir}/plugins/kolab_folders
 %{roundcubedir}
 %dir %{_sysconfdir}/%{name}
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/acl.inc.php
+%exclude %{_sysconfdir}/%{name}/calendar.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
 %attr(0640,root,apache) %{_sysconfdir}/%{name}/mimetypes.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/roundcubemail.conf
+%attr(0775,root,apache) %dir /var/lib/roundcubemail
 %attr(0775,root,apache) %dir /var/log/roundcubemail
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %files kolab
 %defattr(-,root,root,-)
+%attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/calendar.inc.php
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/kolab.inc.php
+%{roundcubedir}/plugins/calendar
 %{roundcubedir}/plugins/kolab_addressbook
-%{roundcubedir}/plugins/kolab_core
 %{roundcubedir}/plugins/kolab_folders
+%{roundcubedir}/plugins/kolab_core
 
 %changelog
-* Wed May 18 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.10
+* Mon Jun  6 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.2011060601.svn4841
+- New snapshot version
 - Fix ID
 - Fix permission typo
 - Remove Net/IDNA2 plugin
@@ -287,7 +318,7 @@ exit 0
 - Removing osx files, will be pulled from next upstream release.
 
 * Fri Jun 13 2008 Jon Ciesla <limb at jcomserv.net> = 0.2-0.alpha
-- Update to 0.2-alpha, security fixes for BZ 423271. 
+- Update to 0.2-alpha, security fixes for BZ 423271.
 - mysql update and pear patches applied upstream.
 - Patched config paths.
 
@@ -351,10 +382,10 @@ exit 0
 - Removed duplicate docs.
 - Moved SQL to doc.
 - Fixed perms on log dir, sysconfdir.
-- Fixed Requires.  
+- Fixed Requires.
 - Fixed config.
 - Fixed changelog spacing.
-  
+
 * Fri May 04 2007 Jon Ciesla <limb at jcomserv.net> - 0.1-beta2.2.2
 - Created new source tarball with PEAR code removed. Added script for creation.
 
diff --git a/sources b/sources
index 0743a92..03fee47 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-0a78327a115563726356446855eefd88  roundcube-calendar.tar.gz
-0fd57443fa680855f36d91b3e6137c32  kolab_folders.tgz
-b0609c34f810e8f0787319a468cb8812  roundcubemail-0.6-svn4787.tar.gz
+f8ab9117ee46ca2684f72928713dcf6b  roundcubemail-0.6-svn4841.tar.gz
+458973cf463929d18f547e9255be3744  roundcubemail-plugins-0.6-2011060601.tar.gz




More information about the packaging-commits mailing list