packages: iceweasel/iceweasel-install.patch, iceweasel/iceweasel.spec - upd...

[baggins]

Author: baggins                      Date: Tue Jun  5 18:11:59 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 13.0

---- Files affected:
packages/iceweasel:
   iceweasel-install.patch (1.12 -> 1.13) , iceweasel.spec (1.180 -> 1.181) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.12 packages/iceweasel/iceweasel-install.patch:1.13
--- packages/iceweasel/iceweasel-install.patch:1.12	Thu Mar 22 22:14:09 2012
+++ packages/iceweasel/iceweasel-install.patch	Tue Jun  5 20:11:53 2012
@@ -29,7 +29,7 @@
  endif # LIBXUL_SDK
 --- mozilla/toolkit/mozapps/installer/packager.mk.orig	2011-03-19 00:34:12.000000000 +0100
 +++ mozilla/toolkit/mozapps/installer/packager.mk	2011-03-22 23:53:43.877485659 +0100
-@@ -708,30 +708,30 @@
+@@ -708,35 +708,35 @@
  endif
  
  stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
@@ -49,6 +49,12 @@
 -	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 +	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \
  	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+ ifeq (DMG, $(MOZ_PKG_FORMAT))
+ ifeq (dmg, $(filter dmg, $(MOZ_INTERNAL_SIGNING_FORMAT)))
+-	@cd $(DIST)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources
++	@cd $(DESTDIR)/$(_APPNAME)/Contents && ln -sf _CodeSignature/CodeResources CodeResources
+ endif
+ endif
 -	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
 +	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.180 packages/iceweasel/iceweasel.spec:1.181
--- packages/iceweasel/iceweasel.spec:1.180	Tue Jun  5 00:29:13 2012
+++ packages/iceweasel/iceweasel.spec	Tue Jun  5 20:11:53 2012
@@ -31,12 +31,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	12.0
-Release:	1
+Version:	13.0
+Release:	0.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:	80c3e5927274de7f181fb5f931ac5fd4
+# Source0-md5:	f50ca7656eec47030b396f39075fa980
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:	%{name}-rm_nonfree.sh
@@ -52,7 +52,7 @@
 Patch7:		%{name}-prefs.patch
 Patch8:		%{name}-pld-branding.patch
 Patch9:		%{name}-no-subshell.patch
-Patch10:	%{name}-bug-722975-workaround.patch
+Patch10:	system-cairo.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	GConf2-devel >= 1.2.1
 BuildRequires:	OpenGL-devel
@@ -179,7 +179,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2
-%patch10 -p1
+%patch10 -p2
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
@@ -575,6 +575,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.181  2012/06/05 18:11:53  baggins
+- updated to 13.0
+
 Revision 1.180  2012/06/04 22:29:13  lkrotowski
 - enable multi-job builds
 - enable PGO builds (useful only without system xulrunner, requires
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel-install.patch?r1=1.12&r2=1.13
    http://cvs.pld-linux.org/packages/iceweasel/iceweasel.spec?r1=1.180&r2=1.181