packages: iceweasel/iceweasel-branding.patch, iceweasel/iceweasel-install.p...

[arekm]

Author: arekm                        Date: Wed Jun 22 20:50:49 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 5.0; untested

---- Files affected:
packages/iceweasel:
   iceweasel-branding.patch (1.18 -> 1.19) , iceweasel-install.patch (1.7 -> 1.8) , iceweasel.spec (1.144 -> 1.145) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel-branding.patch
diff -u packages/iceweasel/iceweasel-branding.patch:1.18 packages/iceweasel/iceweasel-branding.patch:1.19
--- packages/iceweasel/iceweasel-branding.patch:1.18	Fri Apr 29 12:15:49 2011
+++ packages/iceweasel/iceweasel-branding.patch	Wed Jun 22 22:50:43 2011
@@ -201,9 +201,9 @@
 -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
 +pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
 +pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
- pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/");
  // The time interval between checks for a new version (in seconds)
  // nightly=8 hours, official=24 hours
+ pref("app.update.interval", 28800);
 @@ -12,11 +12,11 @@
  pref("app.update.url.manual", "http://nightly.mozilla.org/");
  // A default value for the "More information about this update" link
@@ -226,9 +226,9 @@
 -pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
 +pref("startup.homepage_override_url","http://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/");
 +pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/firefox/%VERSION%/firstrun/");
- pref("browser.panorama.welcome_url", "http://www.mozilla.com/firefox/panorama/");
  // The time interval between checks for a new version (in seconds)
  // nightly=8 hours, official=24 hours
+ pref("app.update.interval", 28800);
 @@ -9,14 +9,14 @@
  pref("app.update.download.backgroundInterval", 60);
  // URL user can browse to manually if for some reason all update installation

================================================================
Index: packages/iceweasel/iceweasel-install.patch
diff -u packages/iceweasel/iceweasel-install.patch:1.7 packages/iceweasel/iceweasel-install.patch:1.8
--- packages/iceweasel/iceweasel-install.patch:1.7	Tue Mar 22 23:57:42 2011
+++ packages/iceweasel/iceweasel-install.patch	Wed Jun 22 22:50:43 2011
@@ -32,7 +32,7 @@
 @@ -496,30 +496,30 @@
  endif
  
- stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
+ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN) elfhack
 -	@rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
 +	@rm -rf $(DESTDIR)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
  # NOTE: this must be a tar now that dist links into the tree so that we
@@ -44,7 +44,7 @@
  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
  # STAGEPATH
  ifdef MOZ_PKG_MANIFEST
- 	$(RM) -rf $(DIST)/xpt $(RM) -rf $(DIST)/manifests
+ 	$(RM) -rf $(DIST)/xpt $(DIST)/manifests
  	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 -	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
 +	  "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_DIR))", \

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.144 packages/iceweasel/iceweasel.spec:1.145
--- packages/iceweasel/iceweasel.spec:1.144	Mon May  2 21:59:44 2011
+++ packages/iceweasel/iceweasel.spec	Wed Jun 22 22:50:43 2011
@@ -18,8 +18,8 @@
 %endif
 
 # convert firefox release number to platform version: 4.0.x -> 2.0.x
-%define		xulrunner_main	2.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#4.0})
+%define		xulrunner_main	5.0
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#5.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -30,12 +30,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	4.0.1
-Release:	3
+Version:	5.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:	9abda7d23151e97913c8555a64c13f34
+# Source0-md5:	9f64a01e86a5d424e12a8e3305c5debe
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	7ab5e80db1ffe8784f1cb55dc5651e2f
 Source2:	%{name}-rm_nonfree.sh
@@ -148,7 +148,7 @@
 
 %prep
 %setup -qc
-mv -f mozilla-%{xulrunner_main} mozilla
+mv -f mozilla-release mozilla
 %setup -q -T -D -a1
 cd mozilla
 /bin/sh %{SOURCE2}
@@ -535,6 +535,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.145  2011/06/22 20:50:43  arekm
+- up to 5.0; untested
+
 Revision 1.144  2011/05/02 19:59:44  megabajt
 - revert to iceweasel-branding.tar.bz2 which is updated for iceweasel 4 (fixes lp#773519)
 - install icons to hicolor icon theme so that higher resolutions are available
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-branding.patch?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel-install.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.144&r2=1.145&f=u