From a3f315485335c2cebc9b01b6fe6af0b70e1518bb Mon Sep 17 00:00:00 2001
From: Rosa <rosa@rosa-build.rosalab.ru>
Date: Tue, 27 Mar 2012 04:50:12 +0400
Subject: [PATCH] Automatic import for version 11.0

---
 .abf.yml                         |  2 +-
 firefox-10.0.2-libvpx-1.0.0.diff | 15 +++++++++++++--
 firefox.spec                     | 23 ++++++++++++++++++-----
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index 2788639..4796b25 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 ---
 sources:
-  firefox-10.0.2.source.tar.bz2: d9b459d915d4638a48b3e249fcbaf7cafc27e834
+  firefox-11.0.source.tar.bz2: 0b05f91b81803010502cf89f54c3d0187fb63d7e
diff --git a/firefox-10.0.2-libvpx-1.0.0.diff b/firefox-10.0.2-libvpx-1.0.0.diff
index 58bdad6..0fb4cb9 100644
--- a/firefox-10.0.2-libvpx-1.0.0.diff
+++ b/firefox-10.0.2-libvpx-1.0.0.diff
@@ -1,5 +1,16 @@
---- configure.in	2012-02-24 07:39:37.782252518 -0500
-+++ configure.in.oden	2012-02-24 07:47:42.512246171 -0500
+--- configure	2012-02-16 07:58:59.000000000 +0100
++++ configure.oden	2012-03-13 18:18:34.678772468 +0100
+@@ -17734,7 +17734,7 @@
+ #include "confdefs.h"
+ 
+                 #include <vpx/vpx_decoder.h>
+-                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+                     #error "test failed."
+                 #endif
+                 
+--- configure.in	2012-02-16 07:40:25.000000000 +0100
++++ configure.in.oden	2012-03-13 18:18:53.567773523 +0100
 @@ -5629,7 +5629,7 @@
              dnl v0.9.6 one to check for.
              AC_TRY_COMPILE([
diff --git a/firefox.spec b/firefox.spec
index 15f0965..ca72aa0 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,5 +1,5 @@
-%define major 10
-%define realver %{major}.0.2
+%define major 11
+%define realver %{major}.0
 
 # (tpg) MOZILLA_FIVE_HOME
 %define mozillalibdir %{_libdir}/%{name}-%{realver}
@@ -51,9 +51,9 @@ BuildRequires:	gtk+2-devel
 Requires:	%{mklibname sqlite3_ 0} >= %{sqlite3_version}
 Requires:	%{nss_libname} >= 2:%{nss_version}
 BuildRequires:	autoconf2.1
-BuildRequires:  nspr-devel >= 2:4.8.8
-BuildRequires:  nss-devel >= 2:3.13.1
-BuildRequires:  nss-static-devel >= 2:3.13.1
+BuildRequires:  nspr-devel >= 2:4.9.0
+BuildRequires:  nss-devel >= 2:3.13.2
+BuildRequires:  nss-static-devel >= 2:3.13.2
 BuildRequires:	sqlite3-devel >= 3.7.7.1
 BuildRequires:	libproxy-devel >= 0.4.4
 BuildRequires:	libalsa-devel
@@ -116,7 +116,10 @@ Files and macros mainly for building Firefox extensions.
 %patch3 -p1 -b .defaultbrowser
 %patch6 -p1 -b .wintitle
 %patch7 -p0 -b .no_optimizarion_override
+
+%if %mdkversion >= 201200
 %patch8 -p0 -b .libvpx-1.0.0
+%endif
 
 ## KDE INTEGRATION
 # copy current files and patch them later to keep them in sync
@@ -334,6 +337,16 @@ fi
 
 
 %changelog
+* Sat Mar 17 2012 Oden Eriksson <oeriksson@mandriva.com> 11.0-1
++ Revision: 785448
+- 11.0
+- fix deps
+
+* Tue Mar 13 2012 Oden Eriksson <oeriksson@mandriva.com> 10.0.2-2
++ Revision: 784829
+- fix build
+- rebuild
+
 * Fri Feb 24 2012 Oden Eriksson <oeriksson@mandriva.com> 10.0.2-1
 + Revision: 780160
 - fix deps