[xulrunner/f15/master: 3/3] 2.0 Beta 12

[Christopher Aillon]

commit 3541332ac06292f290494323ea8660a6000e705c
Author: Christopher Aillon <caillon at redhat.com>
Date:   Fri Feb 25 11:14:22 2011 -0800

    2.0 Beta 12
    
    - Remove upstreamed patches:
      - mozilla-notify.patch
      - xulrunner-2.0-os2cc.patch
      - xulrunner-2.0-system-cairo.patch
      - xulrunner-2.0-system-cairo-tee.patch
    
    - Update network pref per https://bugzilla.mozilla.org/show_bug.cgi?id=620472
      and https://bugzilla.mozilla.org/show_bug.cgi?id=629833

 .gitignore                           |    1 +
 mozilla-notify.patch                 |   40 ----------
 sources                              |    2 +-
 xulrunner-2.0-os2cc.patch            |   21 -----
 xulrunner-2.0-system-cairo-tee.patch |   29 -------
 xulrunner-2.0-system-cairo.patch     |  137 ----------------------------------
 xulrunner-redhat-default-prefs.js    |    2 +-
 xulrunner.spec                       |   19 +----
 8 files changed, 8 insertions(+), 243 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31e78ee..3b7e14c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ xulrunner-1.9.3.0b3.source.tar.bz2
 /xulrunner-2.0b9.source.tar.bz2
 /xulrunner-2.0b10.source.tar.bz2
 /xulrunner-2.0b11.source.tar.bz2
+/xulrunner-2.0b12.source.tar.bz2
diff --git a/sources b/sources
index 11a4aa2..05689e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a52b8f4bb98f158ef0639db59dd39bce  xulrunner-2.0b11.source.tar.bz2
+8b343c8f9db97199ddcf9744315c2bbb  xulrunner-2.0b12.source.tar.bz2
diff --git a/xulrunner-redhat-default-prefs.js b/xulrunner-redhat-default-prefs.js
index b407f0f..bb3cfb8 100644
--- a/xulrunner-redhat-default-prefs.js
+++ b/xulrunner-redhat-default-prefs.js
@@ -4,5 +4,5 @@ pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "RPM_VERREL");
 pref("intl.locale.matchOS", true);
-pref("toolkit.networkmanager.disable", false);
+pref("network.manage-offline-status", true);
 pref("toolkit.storage.synchronous", 0);
diff --git a/xulrunner.spec b/xulrunner.spec
index bcb416a..184223c 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -12,7 +12,7 @@
 # rc_version    should be set to the RC number if using an RC, 0 otherwise
 %global gecko_dir_ver 2
 %global alpha_version 0
-%global beta_version  11
+%global beta_version  12
 %global rc_version    0
 
 %global mozappdir         %{_libdir}/%{name}-%{gecko_dir_ver}
@@ -60,7 +60,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        2.0
-Release:        0.22%{?pre_tag}%{?dist}
+Release:        0.23%{?pre_tag}%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -78,14 +78,10 @@ Patch9:         mozilla-build-sbrk.patch
 Patch12:        xulrunner-2.0-64bit-big-endian.patch
 Patch13:        xulrunner-2.0-secondary-jit.patch
 Patch14:        xulrunner-2.0-chromium-types.patch
-Patch15:        xulrunner-2.0-system-cairo.patch
-Patch16:        xulrunner-2.0-system-cairo-tee.patch
-Patch17:        xulrunner-2.0-os2cc.patch
 
 # Fedora specific patches
 Patch20:        mozilla-193-pkgconfig.patch
 Patch21:        mozilla-libjpeg-turbo.patch
-Patch22:        mozilla-notify.patch
 Patch23:        wmclass.patch
 Patch24:        crashreporter-remove-static.patch
 
@@ -116,7 +112,6 @@ BuildRequires:  sqlite-devel >= %{sqlite_version}
 BuildRequires:  startup-notification-devel
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libnotify-devel >= %{libnotify_version}
-BuildRequires:  autoconf213
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  yasm
 BuildRequires:  libcurl-devel
@@ -190,19 +185,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
 %patch12 -p2 -b .64bit-big-endian
 %patch13 -p2 -b .secondary-jit
 %patch14 -p2 -b .chromium-types
-%patch15 -p1 -b .system-cairo
-%patch16 -p1 -b .system-cairo-tee
-%patch17 -p1 -b .os2cc
 
 %patch20 -p2 -b .pk
 %patch21 -p2 -b .jpeg-turbo
-%patch22 -p1 -b .notify
 %patch23 -p1 -b .wmclass
 %patch24 -p1 -b .static
 
-# For xulrunner-2.0-system-cairo-tee.patch
-autoconf-2.13
-
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -480,6 +468,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Feb 25 2011 Christopher Aillon <caillon at redhat.com> - 2.0-0.23
+- Update to 2.0 Beta 12
+
 * Sun Feb 13 2011 Dennis Gilmore <dennis at ausil.us> 2.0-0.22
 - disable nanojit on sparc64 its not supported and doesnt get automatically switched off