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

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri Jun 10 01:32:22 CEST 2011


 .gitignore         |    2 
 roundcubemail.spec |  109 +++++++++++++++++++++++++++++------------------------
 sources            |    4 -
 3 files changed, 64 insertions(+), 51 deletions(-)

New commits:
commit 66853757be30d7fe9abbb85663c5c5e6ee0c1ca2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Jun 10 00:32:08 2011 +0100

    Check in new snapshot

diff --git a/.gitignore b/.gitignore
index 5a85d8c..0775580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ roundcubemail-0.3.1-dep.tar.gz
 /roundcubemail-0.6-svn4787.tar.gz
 /roundcubemail-0.6-svn4841.tar.gz
 /roundcubemail-plugins-0.6-2011060601.tar.gz
+/roundcubemail-0.6-svn4844.tar.gz
+/roundcubemail-plugins-0.6-2011061001.tar.gz
diff --git a/roundcubemail.spec b/roundcubemail.spec
index f6a7caf..0f5a3ce 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,5 +1,5 @@
-%global svnrevision 4841
-%global plugin_version 2011060601
+%global svnrevision 4844
+%global plugin_version 2011061001
 
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log
@@ -7,19 +7,19 @@
 %{?svnrevision: %global svnrevision_suffix svn%{svnrevision}}
 %{?svnrevision: %global _svnrevision_suffix -svn%{svnrevision}}
 
-Name: roundcubemail
-Version:  0.6
-Release:  0.%{plugin_version}.%{?svnrevision_suffix}%{?dist}
-Summary: Round Cube Webmail is a browser-based multilingual IMAP client
+Name:       roundcubemail
+Version:    0.6
+Release:    0.%{plugin_version}.%{?svnrevision_suffix}%{?dist}
+Summary:    Round Cube Webmail is a browser-based multilingual IMAP client
 
-Group: Applications/System
-License: GPLv2
-URL: http://www.roundcube.net
+Group:      Applications/System
+License:    GPLv2
+URL:        http://www.roundcube.net
 # Created with svn export on trunk:
 # 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
+Source0:    roundcubemail-%{version}%{?_svnrevision_suffix}.tar.gz
 # 1225  cd ~/tmp/
 # 1226  git clone ssh://vanmeeuwen@git.kolabsys.com/git/roundcube.git roundcube.git
 # 1227  cd roundcube.git/
@@ -28,34 +28,35 @@ Source0: roundcubemail-%{version}%{?_svnrevision_suffix}.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
+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
-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
-Requires: php-pear-DB
-Requires: php-pear-Mail-Mime
-Requires: php-pear-Net-SMTP
-Requires: php-pear-Net-Socket
-Requires: php
-Requires: httpd
-Requires: php-pear-Mail-mimeDecode
-Requires: php-mcrypt
-Requires: php-pear-MDB2 >= 2.5.0
-Requires: php-pear-MDB2-Driver-mysql
-Requires: php-xml
-Requires: php-mbstring
-Requires: php-pear-Net-IDNA2
+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
+Requires:   php-pear-DB
+Requires:   php-pear-Mail-Mime
+Requires:   php-pear-Net-SMTP
+Requires:   php-pear-Net-Socket
+Requires:   php >= 5.2
+Requires:   httpd
+Requires:   php-pear-Mail-mimeDecode
+Requires:   php-mcrypt
+Requires:   php-pear >= 1.9.0
+Requires:   php-pear-MDB2 >= 2.5.0
+Requires:   php-pear-MDB2-Driver-mysql
+Requires:   php-xml
+Requires:   php-mbstring
+Requires:   php-pear-Net-IDNA2
 
 %description
 RoundCube Webmail is a browser-based multilingual IMAP client
@@ -67,11 +68,11 @@ requires the MySQL database or the PostgreSQL database. The user
 interface is fully skinnable using XHTML and CSS 2.
 
 %package kolab
-Group: Applications/System
-Summary: Kolab plugins for Roundcube
-Requires: %{name} = %{version}-%{release}
-Requires: php-pear-Kolab-Format
-Requires: php-pear-Kolab-Storage
+Group:      Applications/System
+Summary:    Kolab plugins for Roundcube
+Requires:   %{name} = %{version}-%{release}
+Requires:   php-pear-Kolab-Format
+Requires:   php-pear-Kolab-Storage
 
 %description kolab
 This package provides the Kolab plugins for Roundcube
@@ -114,13 +115,6 @@ rm -rf %{buildroot}
 install -d %{buildroot}%{roundcubedir}
 cp -pr ./* %{buildroot}%{roundcubedir}
 
-#ln -s ../../../pear/PEAR.php %{buildroot}%{roundcubedir}/program/lib/PEAR.php
-#ln -s ../../../pear/Auth %{buildroot}%{roundcubedir}/program/lib/Auth
-#ln -s ../../../pear/DB %{buildroot}%{roundcubedir}/program/lib/DB
-#ln -s ../../../pear/DB.php %{buildroot}%{roundcubedir}/program/lib/DB.php
-#ln -s ../../../pear/Mail %{buildroot}%{roundcubedir}/program/lib/Mail
-#ln -s ../../../pear/Net %{buildroot}%{roundcubedir}/program/lib/Net
-
 rm -rf %{buildroot}%{roundcubedir}/installer
 
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
@@ -182,8 +176,20 @@ rm -rf %{buildroot}%{roundcubedir}/{CHANGELOG,INSTALL,LICENSE,README,UPGRADING,S
 #
 
 # php-pear-Net-IDNA2
-rm -rf %{buildroot}/%{roundcubedir}/program/lib/Net/IDNA2 \
+rm -rf %{buildroot}/%{roundcubedir}/program/lib/Net/IDNA2/ \
     %{buildroot}/%{roundcubedir}/program/lib/Net/IDNA2.php
+# php-pear-Net-SMTP
+rm -rf %{buildroot}/%{roundcubedir}/program/lib/Net/SMTP.php
+# php-pear-Net-Socket
+rm -rf %{buildroot}/%{roundcubedir}/program/lib/Net/Socket.php
+# php-pear-Mail
+rm -rf %{buildroot}/%{roundcubedir}/program/lib/Mail/
+# php-pear-MDB2
+rm -rf %{buildroot}/%{roundcubedir}/program/lib/MDB2/ \
+    %{buildroot}/%{roundcubedir}/program/lib/MDB2.php
+# php-pear
+rm -rf %{buildroot}/%{roundcubedir}/program/lib/PEAR.php \
+    %{buildroot}/%{roundcubedir}/program/lib/PEAR5.php
 
 %clean
 rm -rf %{buildroot}
@@ -243,6 +249,11 @@ exit 0
 %{roundcubedir}/plugins/kolab_core
 
 %changelog
+* Fri Jun 10 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.2011061001.svn4844
+- New snapshot version
+- Literally remove all the external libraries
+- Fix #108 configuration for Horde
+
 * Mon Jun  6 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 0.6-0.2011060601.svn4841
 - New snapshot version
 - Fix ID
diff --git a/sources b/sources
index 03fee47..1db2fbd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f8ab9117ee46ca2684f72928713dcf6b  roundcubemail-0.6-svn4841.tar.gz
-458973cf463929d18f547e9255be3744  roundcubemail-plugins-0.6-2011060601.tar.gz
+4cc9d8cc51bf6ccd8d72cb407a4d5dbe  roundcubemail-0.6-svn4844.tar.gz
+ac37b6b186c55a0bd47938cb69f386c4  roundcubemail-plugins-0.6-2011061001.tar.gz




More information about the packaging-commits mailing list