[thunderbird-lightning] Update to thunderbird 3.1.11 source Drop notify patch, fixed upstream Change BR nss-devel to nss-sta

[Orion Poplawski]

commit 71dc1128171b9881ddba2465daf6bf0eeb312d88
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Jun 28 12:04:48 2011 -0600

    Update to thunderbird 3.1.11 source
    Drop notify patch, fixed upstream
    Change BR nss-devel to nss-static (Bug 717246)

 .gitignore                 |    1 +
 mozilla-notify.patch       |   12 ------------
 sources                    |    2 +-
 thunderbird-lightning.spec |   14 ++++++++------
 4 files changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65383a6..c5f5874 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /thunderbird-3.1.9.source.tar.bz2
+/thunderbird-3.1.11.source.tar.bz2
diff --git a/sources b/sources
index c8728d6..95df470 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6917c419d3aaa8083a1d4b53fb80d8c  thunderbird-3.1.9.source.tar.bz2
+25833b3f90925d96285630d22c85cd5c  thunderbird-3.1.11.source.tar.bz2
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index 1d6c030..3e315d1 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -4,10 +4,9 @@
 %global freetype_version 2.1.9
 %global sqlite_version 3.6.14
 %global libnotify_version 0.4
-%global thunderbird_version 3.1.9
+%global thunderbird_version 3.1.11
 %global moz_objdir objdir-tb
 %global thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
-%global lightning_release 0.39.b3pre
 %global lightning_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{e2fda1a4-762b-4020-b5ad-a41df1933103}
 %global gdata_extname %{_libdir}/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}
 
@@ -25,7 +24,7 @@
 Name:           thunderbird-lightning
 Summary:        The calendar extension to Thunderbird
 Version:        1.0
-Release:        0.41.b3pre%{?dist}
+Release:        0.42.b3pre%{?dist}
 URL:            http://www.mozilla.org/projects/calendar/lightning/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Productivity
@@ -44,12 +43,11 @@ Patch3:         xulrunner-1.9.2.1-build.patch
 Patch4:         mozilla-libjpeg-turbo.patch
 Patch5:         mozilla-missing-cflags.patch
 Patch6:         mozilla-build-s390.patch
-Patch8:         mozilla-notify.patch
 Patch9:         xulrunner-2.0-os2cc.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
-BuildRequires:  nss-devel >= %{nss_version}
+BuildRequires:  nss-static >= %{nss_version}
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libnotify-devel >= %{libnotify_version}
 BuildRequires:  libpng-devel
@@ -104,7 +102,6 @@ cd mozilla
 %patch4 -p2 -b .turbo
 %patch5 -p2 -b .mozcflags
 %patch6 -p1 -b .s390
-%patch8 -p2 -b .libnotify
 %patch9 -p1 -b .os2cc
 cd ..
 
@@ -183,6 +180,11 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Tue Jun 28 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.42.b3pre
+- Update to thunderbird 3.1.11 source
+- Drop notify patch, fixed upstream
+- Change BR nss-devel to nss-static (Bug 717246)
+
 * Mon Apr 11 2011 Orion Poplawski <orion at cora.nwra.com> 1.0-0.41.b3pre
 - Fix debuginfo builds
 - Remove official branding sections