[packages/iceweasel] - fixed packaginf patch - updated branding bundle

[baggins]

commit d925866a7ba3b57c78d2fb2de55666651bb6c71d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Mar 19 15:06:14 2014 +0100

    - fixed packaginf patch
    - updated branding bundle

 iceweasel-packaging.patch | 19 ++++++++++++++-----
 iceweasel.spec            |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/iceweasel.spec b/iceweasel.spec
index afad5b1..aff9945 100644
--- a/iceweasel.spec
+++ b/iceweasel.spec
@@ -31,7 +31,7 @@ Group:		X11/Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
 # Source0-md5:	db06b6da6b826cfc6a49c15bca115a6b
 Source1:	%{name}-branding.tar.bz2
-# Source1-md5:	513af080c920d916362b607a872adf00
+# Source1-md5:	22b0d377cabb6567dd0330f9ab669120
 Source2:	%{name}-rm_nonfree.sh
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch
index 89ee232..368fe22 100644
--- a/iceweasel-packaging.patch
+++ b/iceweasel-packaging.patch
@@ -294,14 +294,11 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  @BINPATH@/components/servicesComponents.manifest
  @BINPATH@/components/cryptoComponents.manifest
  @BINPATH@/components/TelemetryPing.js
-@@ -581,10 +581,12 @@
- @BINPATH@/components/PeerConnection.js
- @BINPATH@/components/PeerConnection.manifest
- #endif
-+#endif
+@@ -581,7 +581,9 @@
  
  @BINPATH@/components/HttpDataUsage.manifest
  @BINPATH@/components/HttpDataUsage.js
++#endif
  
 +#ifndef LIBXUL_SDK
  @BINPATH@/chrome/marionette at JAREXT@
@@ -407,3 +404,15 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea
  
  ; for Solaris SPARC
  #ifdef SOLARIS
+@@ -907,9 +907,11 @@
+ @BINPATH@/metro/modules
+ #endif
+ 
++#ifndef LIBXUL_SDK
+ @BINPATH@/components/DataStore.manifest
+ @BINPATH@/components/DataStoreService.js
+ @BINPATH@/components/dom_datastore.xpt
++#endif
+ 
+ 
+ #ifdef MOZ_ASAN
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iceweasel.git/commitdiff/d925866a7ba3b57c78d2fb2de55666651bb6c71d