[thunderbird-lightning] - Update to 2.6 - Drop alarm patch - Drop -fpermissive

[Orion Poplawski]

commit 289669e03125450b48e439f15d719df6fe8169b2
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri Sep 20 09:17:14 2013 -0600

    - Update to 2.6
    - Drop alarm patch
    - Drop -fpermissive

 thunderbird-lightning-alarm.patch |   60 -------------------------------------
 thunderbird-lightning.spec        |   11 +++----
 2 files changed, 5 insertions(+), 66 deletions(-)
---
diff --git a/thunderbird-lightning.spec b/thunderbird-lightning.spec
index a208f93..87cf615 100644
--- a/thunderbird-lightning.spec
+++ b/thunderbird-lightning.spec
@@ -50,10 +50,6 @@ Patch1:         mozilla-build-arm.patch
 # Fix build on secondary arches (patches copied from xulrunner)
 Patch2:         xulrunner-10.0-secondary-ipc.patch
 
-# Lightning
-# Fix alarm handling after suspend (bug #910976)
-Patch10:        thunderbird-lightning-alarm.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
@@ -128,7 +124,6 @@ cd mozilla
 %patch1 -p2 -b .arm-fix
 %patch2 -p3 -b .secondary-ipc
 cd ..
-%patch10 -p1 -b .alarm
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -164,7 +159,7 @@ MOZ_APP_DIR=%{mozappdir}
 #
 # Disable C++ exceptions since Mozilla code is not exception-safe
 # 
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
                       %{__sed} -e 's/-Wall//')
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
@@ -229,6 +224,10 @@ find $RPM_BUILD_ROOT -name \*.so | xargs chmod 0755
 #===============================================================================
 
 %changelog
+* Fri Sep 20 2013 Orion Poplawski <orion at cora.nwra.com> - 2.6-1
+- Drop alarm patch
+- Drop -fpermissive
+
 * Wed Sep 18 2013 Jan Horak <jhorak at redhat.com> - 2.6-1
 - Update to 2.6