Accepting request 88901 from mozilla:Factory

OBS-URL: https://build.opensuse.org/request/show/88901
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=35

MozillaFirefox-branding-openSUSE.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct 20 20:15:05 UTC 2011 - wr@rosenauer.org
+
+- make susefox compatible up to Firefox 9
+- browser.startup.homepage is now a property in susefox as the
+  resource:// URI is useless in omnijar setup (bnc#721421)
+- no welcome and override startpages
+
 -------------------------------------------------------------------
 Wed Sep 14 21:15:41 UTC 2011 - wr@rosenauer.org
 

MozillaFirefox-branding-openSUSE.spec

@@ -16,17 +16,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
-BuildRequires:  MozillaFirefox bc unzip zip
+BuildRequires:  bc
+BuildRequires:  unzip
+BuildRequires:  zip
 
 Name:           MozillaFirefox-branding-openSUSE
-License:        BSD3c(or similar) ; GPLv2+
 Version:        5.0
-Release:        5
+Release:        3
+License:        BSD3c(or similar) ; GPLv2+
 Summary:        openSUSE branding of MozillaFirefox
 Group:          Productivity/Networking/Web/Browsers
-Source:         susefox-20110914.tar.bz2
+Source:         susefox-20111020.tar.bz2
 Source1:        search-addons.tar.bz2
 Source2:        bookmarks.html.suse
 Source3:        firefox-suse-default-prefs.js
@@ -34,22 +35,21 @@ Source4:        firefox.schemas
 Source5:        distribution.ini.in
 Source6:        %{name}-COPYING
 Source7:        all-openSUSE.js
-Provides:       MozillaFirefox-branding = %{version}
 PreReq:         MozillaFirefox >= 4.99
-Conflicts:      otherproviders(MozillaFirefox-branding)
 Supplements:    packageand(MozillaFirefox:branding-openSUSE)
+Provides:       MozillaFirefox-branding = %{version}
+Conflicts:      otherproviders(MozillaFirefox-branding)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define default_home_page http://www.opensuse.org/
-%define progdir %{_prefix}/%_lib/firefox
+%define progdir %{_libdir}/firefox
 %define libgssapi libgssapi_krb5.so.2
 %define suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null)
+# HINT: default homepage is a property now included in susefox
 #%define gconf_confdir %{_sysconfdir}/gconf
 #%gconf_schemas_prereq
 
 %description
 This package provides openSUSE Look and Feel for MozillaFirefox.
 
-
 %prep
 cp -a %{SOURCE6} COPYING
 %setup -n susefox -q
@@ -83,13 +83,6 @@ install -d $RPM_BUILD_ROOT%{progdir}/searchplugins
 #install -m 644 %{SOURCE4} \
 #               $RPM_BUILD_ROOT%{gconf_confdir}/schemas/
 #%%find_gconf_schemas
-# browserconfig.properties
-cat << EOF >> suse-browserconfig.properties
-browser.startup.homepage=%{default_home_page}
-browser.startup.homepage_reset=%{default_home_page}
-EOF
-install -m0644 suse-browserconfig.properties $RPM_BUILD_ROOT%{progdir}/browserconfig.properties
-rm suse-browserconfig.properties
 # install the system extension
 mkdir susefox\@opensuse.org
 (cd susefox\@opensuse.org; unzip ../susefox.xpi)
@@ -117,7 +110,6 @@ rm -rf $RPM_BUILD_ROOT
 %{progdir}/defaults/pref/firefox-openSUSE.js
 %dir %{progdir}/defaults/profile/
 %{progdir}/defaults/profile/bookmarks.html
-%{progdir}/browserconfig.properties
 %{progdir}/searchplugins/*
 %{progdir}/distribution
 %{_datadir}/mozilla

firefox-suse-default-prefs.js

@@ -10,4 +10,6 @@ pref("print.print_edge_left", 16); // 1/100 of an inch
 pref("print.print_edge_right", 16); // 1/100 of an inch
 pref("print.print_edge_bottom", 14); // 1/100 of an inch
 pref("accessibility.typeaheadfind.soundURL", "default");
-pref("browser.startup.homepage", "resource:///browserconfig.properties");
+pref("browser.startup.homepage", "chrome://susefox/content/susefox.properties");
+pref("startup.homepage_welcome_url", "");
+pref("startup.homepage_override_url", "");

susefox-20110914.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b2807f05690b81ffd131d8801bb529bafae98d7d5ca9eed906f270ac5afc8f2
-size 50695

susefox-20111020.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f7e582015640cb5dd65dfbbc8626014eaf4ca15b68c6422561b1fb0ae62557e
+size 50755