packages: icedove/icedove.desktop, icedove/icedove.spec - 7.0 tarball, xulr...

[glen]

Author: glen                         Date: Sat Oct  1 22:13:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 7.0 tarball, xulrunner deps

---- Files affected:
packages/icedove:
   icedove.desktop (1.2 -> 1.3) , icedove.spec (1.127 -> 1.128) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.desktop
diff -u packages/icedove/icedove.desktop:1.2 packages/icedove/icedove.desktop:1.3
--- packages/icedove/icedove.desktop:1.2	Wed Jul 13 14:32:35 2011
+++ packages/icedove/icedove.desktop	Sun Oct  2 00:13:49 2011
@@ -13,4 +13,6 @@
 Type=Application
 Categories=GTK;Network;Email;
 MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true
+StartupWMClass=Thunderbird-bin
 # vi: encoding=utf-8

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.127 packages/icedove/icedove.spec:1.128
--- packages/icedove/icedove.spec:1.127	Thu Sep 22 10:36:58 2011
+++ packages/icedove/icedove.spec	Sun Oct  2 00:13:49 2011
@@ -27,6 +27,10 @@
 %define		nspr_ver		4.8.8
 %define		nss_ver			3.12.10
 
+# convert firefox release number to platform version: 6.0.x -> 6.0.x
+%define		xulrunner_main	7.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#7.0})
+
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
 %define		sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
@@ -35,12 +39,12 @@
 Summary:	Icedove - email client
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
-Version:	6.0.2
+Version:	7.0
 Release:	0.1
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}.source.tar.bz2
-# Source0-md5:	917a667fe21cfd103092dbc23a112192
+# Source0-md5:	6a4b2dbdc2324f52c019a3a8dee6dad4
 Source1:	http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5:	2318d60320dc6c3db3c34d968bb7d533
 Source2:	%{name}-branding.tar.bz2
@@ -90,15 +94,18 @@
 BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	yasm
 BuildRequires:	zip
-Requires(post):	mktemp >= 1.5-18
 %if %{with xulrunner}
-BuildRequires:	xulrunner-devel
+BuildRequires:	xulrunner-devel >= 2:%{xulrunner_ver}
 %else
 Requires:	myspell-common
 Requires:	nspr >= 1:%{nspr_ver}
 Requires:	nss >= 1:%{nss_ver}
 Requires:	sqlite3 >= %{sqlite_build_version}
 %endif
+Requires(post):	mktemp >= 1.5-18
+%if %{with xulrunner}
+%requires_eq_to	xulrunner xulrunner-devel
+%endif
 Obsoletes:	mozilla-thunderbird
 Obsoletes:	mozilla-thunderbird-dictionary-en-US
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -185,7 +192,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+%patch4 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
@@ -547,6 +554,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.128  2011/10/01 22:13:49  glen
+- 7.0 tarball, xulrunner deps
+
 Revision 1.127  2011/09/22 08:36:58  lisu
 - start adjusting files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.desktop?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.127&r2=1.128&f=u