- up to 10.0

Changed files:
    iceweasel-branding.patch -> 1.21
    iceweasel-install.patch -> 1.11
    iceweasel-ppc.patch -> 1.3
    iceweasel.spec -> 1.170

diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch
index 3727e7691cc49bfe754b92130938acd1d57adb2b..aa7ad82b38a86cd02cd3ba16f853eb78ff10321b 100644 (file)
--- a/iceweasel-branding.patch
+++ b/iceweasel-branding.patch
@@ -55,7 +55,7 @@ diff -urN mozilla.orig/browser/confvars.sh mozilla/browser/confvars.sh
 diff -urN mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties
 --- mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.properties  2010-02-04 15:47:13.000000000 +0100
 +++ mozilla/browser/locales/en-US/chrome/overrides/appstrings.properties       2010-02-04 15:48:50.000000000 +0100
-@@ -35,23 +35,23 @@
+@@ -35,24 +35,24 @@
  # ***** END LICENSE BLOCK *****
  
  malformedURI=The URL is not valid and cannot be loaded.
@@ -77,6 +77,7 @@ diff -urN mozilla.orig/browser/locales/en-US/chrome/overrides/appstrings.propert
 -unknownSocketType=Firefox doesn't know how to communicate with the server.
 +unknownSocketType=Iceweasel doesn't know how to communicate with the server.
  netReset=The connection to the server was reset while the page was loading.
+ notCached=This document is no longer available.
 -netOffline=Firefox is currently in offline mode and can't browse the Web.
 +netOffline=Iceweasel is currently in offline mode and can't browse the Web.
  isprinting=The document cannot change while Printing or in Print Preview.

diff --git a/iceweasel-install.patch b/iceweasel-install.patch
index 3c61ad40d9e57a32f97ba27b0f86649965785dc9..50ce80883b2d33461e39f62e1d930cddf99357f8 100644 (file)
--- a/iceweasel-install.patch
+++ b/iceweasel-install.patch
@@ -1,11 +1,11 @@
 --- mozilla/browser/app/Makefile.in    2008-06-22 22:54:03.000000000 +0200
 +++ mozilla/browser/app/Makefile.in    2008-06-23 10:34:59.000000000 +0200
 @@ -397,7 +397,7 @@
-       rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
-       $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
+       rsync -a $(DIST)/bin/ $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)
+       $(RM) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/mangle $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/$(APPFILES)/shlibsign
  ifdef LIBXUL_SDK
--      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox
-+      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)
+-      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/firefox
++      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(MOZ_MACBUNDLE_NAME)/Contents/MacOS/$(MOZ_APP_NAME)
  else
        rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
        rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS

diff --git a/iceweasel-ppc.patch b/iceweasel-ppc.patch
deleted file mode 100644 (file)
index 0cf48f2..0000000
--- a/iceweasel-ppc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mozilla/xpcom/glue/nsTArray.h~     2009-06-29 18:15:32.000000000 +0200
-+++ mozilla/xpcom/glue/nsTArray.h      2009-07-02 09:49:47.623908821 +0200
-@@ -43,7 +43,14 @@
- #include "nsQuickSort.h"
- #include "nsDebug.h"
- #include "nsTraceRefcnt.h"
-+#ifdef inline
-+#define crappy_inline inline
-+#undef inline
-+#endif
- #include NEW_H
-+#ifdef crappy_inline
-+#define inline crappy_inline
-+#endif
- 
- //
- // NB: nsTArray assumes that your "T" can be memmove()d.  This is in

diff --git a/iceweasel.spec b/iceweasel.spec
index 93a7e447c4d06add660635b20a7d8a7f895b646e..97304b4c17262d0292f476fdd2d8a476513d9645 100644 (file)
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -15,8 +15,8 @@
 %endif
 
 # convert firefox release number to platform version: 9.0.x -> 9.0.x
-%define                xulrunner_main  9.0
-%define                xulrunner_ver   %(v=%{version}; echo %{xulrunner_main}${v#9.0})
+%define                xulrunner_main  10.0
+%define                xulrunner_ver   %(v=%{version}; echo %{xulrunner_main}${v#10.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -27,12 +27,12 @@ Summary:    Iceweasel web browser
 Summary(hu.UTF-8):     Iceweasel web böngésző
 Summary(pl.UTF-8):     Iceweasel - przeglądarka WWW
 Name:          iceweasel
-Version:       9.0.1
+Version:       10.0
 Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: 7cf2bd379792a9b232267c6a79680566
+# Source0-md5: 13c61203ccfa583e5a54b4dc22f41233
 Source1:       %{name}-branding.tar.bz2
 # Source1-md5: 7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:       %{name}-rm_nonfree.sh
@@ -48,7 +48,6 @@ Patch6:               %{name}-nss_cflags.patch
 Patch7:                %{name}-prefs.patch
 Patch8:                %{name}-pld-branding.patch
 Patch9:                %{name}-no-subshell.patch
-Patch10:       %{name}-ppc.patch
 URL:           http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: OpenGL-devel
@@ -168,7 +167,6 @@ cd mozilla
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2
-%patch10 -p1
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy