SPECS (AC-branch): mozilla-thunderbird.spec - merged 2.0.0.0-relea...

[glen]

Author: glen                         Date: Thu Apr 19 19:09:38 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 2.0.0.0-release from HEAD

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

---- Diffs:

================================================================
Index: SPECS/mozilla-thunderbird.spec
diff -u SPECS/mozilla-thunderbird.spec:1.100.2.4 SPECS/mozilla-thunderbird.spec:1.100.2.5
--- SPECS/mozilla-thunderbird.spec:1.100.2.4	Mon Apr  9 22:28:05 2007
+++ SPECS/mozilla-thunderbird.spec	Thu Apr 19 21:09:33 2007
@@ -8,21 +8,17 @@
 %bcond_without	enigmail    # don't build enigmail - GPG/PGP support
 %bcond_without	ldap	    # disable e-mail address lookups in LDAP directories
 #
-%define		_rc		b2
-%define		_ver	2.0
-%define		_release	0.%{_rc}.%{_rel}
 %define		_enigmail_ver	0.94.3
 
-%define		_rel	6
 Summary:	Thunderbird Community Edition - email client
-Summary(pl):	Thunderbird Community Edition - klient poczty
+Summary(pl.UTF-8):	Thunderbird Community Edition - klient poczty
 Name:		mozilla-thunderbird
-Version:	%{_ver}
-Release:	%{_release}
+Version:	2.0.0.0
+Release:	1
 License:	MPL/LGPL
 Group:		Applications/Networking
-Source0:	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}%{_rc}/source/thunderbird-%{version}%{_rc}-source.tar.bz2
-# Source0-md5:	b633623c460ffef9ba805dd071729890
+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
 Source2:	%{name}.desktop
@@ -34,10 +30,6 @@
 Patch4:		%{name}-enigmail-shared.patch
 Patch5:		%{name}-gcc.patch
 Patch6:		%{name}-fonts.patch
-# drop as soon as bug is fixed since it's so ugly hack
-# fixing symptoms only
-# https://bugzilla.mozilla.org/show_bug.cgi?id=362462
-Patch7:		mozilla-hack-gcc_4_2.patch
 Patch8:		%{name}-install.patch
 Patch9:		%{name}-myspell.patch
 Patch10:	%{name}-regionNames.patch
@@ -79,11 +71,11 @@
 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:	%{_rel}
+Release:	%{release}
 License:	MPL/LGPL
 Group:		Applications/Networking
 URL:		http://enigmail.mozdev.org/
-Requires:	%{name} = %{_ver}-%{_release}
+Requires:	%{name} = %{version}-%{release}
 
 %description addon-enigmail
 Enigmail is an extension to the mail client of Mozilla Thunderbird
@@ -113,7 +105,7 @@
 - interfejs do zarządzania kluczami OpenPGP
 
 %prep
-%setup -q -c -n %{name}-%{_ver}%{_rc}
+%setup -q -c
 cd mozilla
 %{?with_enigmail:tar xvfz %{SOURCE1} -C mailnews/extensions}
 %patch1 -p1
@@ -121,7 +113,6 @@
 %{?with_enigmail:%patch4 -p1}
 %patch5 -p1
 %patch6 -p1
-%patch7 -p2
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
@@ -344,6 +335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100.2.5  2007/04/19 19:09:33  glen
+- merged 2.0.0.0-release from HEAD
+
 Revision 1.100.2.4  2007/04/09 20:28:05  glen
 - pretrans is a proper place for replacing dirs/symlinks
 - rel 6
================================================================

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