SPECS (AC-branch): mozilla-thunderbird.spec - HEAD merge (baggins)...

[glen]

Author: glen                         Date: Wed May 16 16:50:56 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge (baggins):
  - rel 2
  - updated enigmail to 0.95.0 (compatible with mt 2.0)
  - fix reqs in enigmail-addon

---- Files affected:
SPECS:
   mozilla-thunderbird.spec (1.100.2.5 -> 1.100.2.6) 

---- Diffs:

================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.100.2.5 SPECS/mozilla-thunderbird.spec:1.100.2.6
--- SPECS/mozilla-thunderbird.spec:1.100.2.5	Thu Apr 19 21:09:33 2007
+++ SPECS/mozilla-thunderbird.spec	Wed May 16 18:50:50 2007
@@ -2,25 +2,25 @@
 # TODO:
 # - CHECK all features of enigmail
 # - separate spec for enigmail
-# - enigmail says it's not compatible with thunderbird 2.0, while home page says it is.
 #
 # Conditional builds
 %bcond_without	enigmail    # don't build enigmail - GPG/PGP support
 %bcond_without	ldap	    # disable e-mail address lookups in LDAP directories
 #
-%define		_enigmail_ver	0.94.3
+%define		_enigmail_ver		0.95.0
+%define		_thunderbird_ver	2.0.0.0
 
 Summary:	Thunderbird Community Edition - email client
-Summary(pl.UTF-8):	Thunderbird Community Edition - klient poczty
+Summary(pl):	Thunderbird Community Edition - klient poczty
 Name:		mozilla-thunderbird
-Version:	2.0.0.0
-Release:	1
+Version:	%{_thunderbird_ver}
+Release:	2
 License:	MPL/LGPL
 Group:		Applications/Networking
 Source0:	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2
 # Source0-md5:	8e672d9f9206e0e1f03790dacb51e1bb
 Source1:	http://www.mozilla-enigmail.org/downloads/src/enigmail-%{_enigmail_ver}.tar.gz
-# Source1-md5:	08727eea68589eb4c9087ca771229f06
+# Source1-md5:	820ab216b6ba21f81392d56bb9991c18
 Source2:	%{name}.desktop
 Source3:	%{name}.sh
 Source4:	%{name}-enigmail.manifest
@@ -71,11 +71,10 @@
 Summary:	Extension for the authentication and encryption features provided by GnuPG
 Summary(pl):	Rozszerzenie do uwierzytelniania i szyfrowania zapewnianego przez GnuPG
 Version:	%{_enigmail_ver}
-Release:	%{release}
 License:	MPL/LGPL
 Group:		Applications/Networking
 URL:		http://enigmail.mozdev.org/
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{_thunderbird_ver}-%{release}
 
 %description addon-enigmail
 Enigmail is an extension to the mail client of Mozilla Thunderbird
@@ -335,6 +334,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100.2.6  2007/05/16 16:50:50  glen
+- HEAD merge (baggins):
+  - rel 2
+  - updated enigmail to 0.95.0 (compatible with mt 2.0)
+  - fix reqs in enigmail-addon
+
 Revision 1.100.2.5  2007/04/19 19:09:33  glen
 - merged 2.0.0.0-release from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozilla-thunderbird.spec?r1=1.100.2.5&r2=1.100.2.6&f=u