packages: roundcubemail/roundcubemail.spec, roundcubemail/shared-folders.pa...

[glen]

Author: glen                         Date: Mon Jan 17 19:22:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge 0.5 from DEVEL

---- Files affected:
packages/roundcubemail:
   roundcubemail.spec (1.107 -> 1.108) , shared-folders.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.107 packages/roundcubemail/roundcubemail.spec:1.108
--- packages/roundcubemail/roundcubemail.spec:1.107	Tue Oct 12 13:12:28 2010
+++ packages/roundcubemail/roundcubemail.spec	Mon Jan 17 20:22:43 2011
@@ -1,10 +1,11 @@
 # $Revision$, $Date$
 # TODO:
+# - use gpl-dependant tarball, instead of full tarball and removing all bundled libs again?
+#   see: http://www.roundcubeforum.net/3-news-announcements/32-news-announcements/6601-roundcube-news-new-version-0-4-beta-released.html
 # - move bin/* to -setup which are related to upgrading/setup
 # - use system js/tiny_mce
 # - use system js/jquery
 # - use system magic db: program/lib/magic
-# - script to %lang all "localization" dirs
 # - package: http://blog.ilohamail.org/ and remove boundled classess from it
 # - Some php-database backend. Suggests?
 # - test/finish and then enable by default password-anon-ldap-bind patch
@@ -15,17 +16,16 @@
 
 %define		rcpfa_ver	1.0.5
 %define		php_min_version 5.2.3
-
 %include	/usr/lib/rpm/macros.php
 Summary:	RoundCube Webmail
 Summary(pl.UTF-8):	RoundCube Webmail - poczta przez WWW
 Name:		roundcubemail
-Version:	0.4.2
-Release:	2
+Version:	0.5
+Release:	1
 License:	GPL v2
 Group:		Applications/Mail
 Source0:	http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}.tar.gz
-# Source0-md5:	d28417f0f16ff2a251a964be153c967a
+# Source0-md5:	66111e52784221c56c477adb60cc7f5c
 Source1:	%{name}.config
 Source2:	%{name}.logrotate
 Source3:	%{name}-lighttpd.conf
@@ -38,11 +38,9 @@
 Patch3:		%{name}-faq-page.patch
 Patch4:		%{name}-password-anon-ldap-bind.patch
 Patch5:		use-iconv.patch
-# Disabled. Because of this patch roundcube does not show folders other than INBOX.
-# Patch6:		shared-folders.patch
 URL:		http://www.roundcube.net/
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
-BuildRequires:	rpmbuild(macros) >= 1.553
+BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-skin
 Requires:	php-common >= 4:%{php_min_version}
@@ -53,6 +51,7 @@
 Requires:	php-pcre
 Requires:	php-pear-DB
 Requires:	php-pear-Mail_Mime
+Requires:	php-pear-Net_IDNA2 >= 0.1.1
 Requires:	php-pear-Net_SMTP
 Requires:	php-session
 Requires:	php-simplexml
@@ -149,15 +148,12 @@
 %if %{with postfixadmin}
 #patch2 -p1
 %endif
-%patch3 -p1
+#%patch3 -p1
 %if %{with password_anon_ldap_bind}
 %patch4 -p1
 %endif
 %patch5 -p1
 
-# Disabled. Because of this patch roundcube does not show folders other than INBOX.
-#%%patch6 -p1
-
 find -name .svn | xargs -r rm -rf
 
 # undos the source
@@ -197,6 +193,10 @@
 # php-pear-Net_Sieve 1.3.0
 rm plugins/managesieve/lib/Net/Sieve.php
 
+# 0.1.1 snapshot (at least r301175)
+rm program/lib/Net/IDNA2.php
+rm -r program/lib/Net/IDNA2
+
 # now empty dirs
 rmdir program/lib/Auth
 rmdir program/lib/Mail
@@ -315,8 +315,12 @@
 fi
 
 # Note this on version upgrade
-%triggerpostun -- %{name} < %{version}
-%banner -e %{name} <<-EOF
+%triggerpostun -- %{name} < %{version}-0
+# don't do anything on --downgrade
+if [ $1 -le 1 ]; then
+	exit 0
+fi
+%banner -e %{name}-upgrade <<-EOF
 Run %{_appdir}/bin/update to update to version %{version}.
 (Be sure to have %{name}-setup installed when you run it)
 
@@ -394,6 +398,40 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2011/01/17 19:22:43  glen
+- merge 0.5 from DEVEL
+
+Revision 1.107.2.10  2011/01/14 09:39:28  caleb
+- Up to 0.5 stable release
+
+Revision 1.107.2.9  2010/12/18 11:46:13  caleb
+- Up to 1.0.5-rc
+
+Revision 1.107.2.8  2010/12/08 22:31:09  glen
+- undos -f deps, noted on devel-en list
+
+Revision 1.107.2.7  2010/12/08 19:20:53  glen
+- tarball choice todo
+
+Revision 1.107.2.6  2010/12/08 19:19:25  glen
+- trigger: use lowest release in target version (release=0)
+- trigger: skip version note on downgrade
+
+Revision 1.107.2.5  2010/12/08 19:05:43  glen
+- include release on trigger, or the trigger will match on each upgrade
+
+Revision 1.107.2.4  2010/12/08 15:00:30  glen
+- shared patch applied in r4198
+
+Revision 1.107.2.3  2010/12/08 14:58:30  glen
+- use Net_IDNA2 >= 0.1.1 dep
+
+Revision 1.107.2.2  2010/12/08 14:21:13  glen
+- use common subver macro
+
+Revision 1.107.2.1  2010/12/08 13:47:58  caleb
+- DEVEL branch, up to 0.5 beta. NT
+
 Revision 1.107  2010/10/12 11:12:28  pawelz
 - disabled shared-folders.patch. Because of this patch roundcube does not show
 folders other than INBOX. Please please please, test your changes! If this
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail.spec?r1=1.107&r2=1.108&f=u