Accepting request 318935 from mozilla:Factory

- identify Leap 42.1 correctly
- searchplugins need to be placed under distribution with FF 40
- disable susefox
  * its main purpose the plugin finder service misses server
    side maintenance and NPAPI plugins are being obsoleted sooner
    or later
- homepage setting moved back from susefox to distribution
  configuration

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

MozillaFirefox-branding-openSUSE.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Jul 26 08:14:23 UTC 2015 - wr@rosenauer.org
+
+- identify Leap 42.1 correctly
+- searchplugins need to be placed under distribution with FF 40
+- disable susefox
+  * its main purpose the plugin finder service misses server
+    side maintenance and NPAPI plugins are being obsoleted sooner
+    or later
+- homepage setting moved back from susefox to distribution
+  configuration
+
 -------------------------------------------------------------------
 Mon Mar 25 22:41:28 UTC 2013 - wr@rosenauer.org
 

MozillaFirefox-branding-openSUSE.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package MozillaFirefox-branding-openSUSE
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2008-2013 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
@@ -21,7 +21,7 @@ Name:           MozillaFirefox-branding-openSUSE
 BuildRequires:  bc
 BuildRequires:  unzip
 BuildRequires:  zip
-Version:        21
+Version:        40
 Release:        0
 Summary:        openSUSE branding of MozillaFirefox
 License:        BSD-3-Clause and GPL-2.0+
@@ -45,19 +45,32 @@ Conflicts:      otherproviders(firefox-esr-branding)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define progdir %{_libdir}/firefox
 %define libgssapi libgssapi_krb5.so.2
+%if %suse_version == 1315
+# Leap 42
+%define suseversion 42.1
+%define distname openSUSE Leap
+%else
+# openSUSE <= 13.2 & Tumbleweed?
 %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 distname openSUSE
+%endif
+%define homepage http://www.opensuse.org/
+%define susefox 0
 
 %description
 This package provides openSUSE Look and Feel for Firefox.
 
 %prep
 cp -a %{SOURCE6} COPYING
+%if %susefox
 %setup -n susefox -q
 mv COPYING COPYING.susefox
+%endif
 
 %build
+%if %susefox
 ./build.sh
+%endif
 
 %install
 install -d $RPM_BUILD_ROOT%{progdir}
@@ -75,28 +88,35 @@ rm suse-default-prefs
 install -m0644 %{SOURCE7} $RPM_BUILD_ROOT%{progdir}/defaults/pref/
 # distribution.ini
 install -d $RPM_BUILD_ROOT%{progdir}/distribution
-sed -e 's,%VERSION%,%{suseversion},g' \
+sed -e 's,%VERSION%,%{suseversion},g
+s,%HOMEPAGE%,%{homepage},g
+s,%DIST%,%{distname},g' \
    %{SOURCE5} > distribution.ini
 install -m 0644 distribution.ini $RPM_BUILD_ROOT%{progdir}/distribution/
 # search plugins
-install -d $RPM_BUILD_ROOT%{progdir}/browser/searchplugins
+install -d $RPM_BUILD_ROOT%{progdir}/distribution/searchplugins/common/
 sed -e 's,%VERSION%,%{suseversion},g' \
-  %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/browser/searchplugins/opensuse-software.xml
-cp %{SOURCE8} $RPM_BUILD_ROOT%{progdir}/browser/searchplugins/
+  %{SOURCE1} > $RPM_BUILD_ROOT%{progdir}/distribution/searchplugins/common/opensuse-software.xml
+cp %{SOURCE8} $RPM_BUILD_ROOT%{progdir}/distribution/searchplugins/common/
+%if %susefox
 # install the system extension
 mkdir susefox\@opensuse.org
 (cd susefox\@opensuse.org; unzip ../susefox.xpi)
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/
 cp -r susefox\@opensuse.org \
       $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
+%if %susefox
 %doc COPYING.susefox
 %doc ../COPYING
+%{_datadir}/mozilla
+%endif
 %dir %{progdir}
 %dir %{progdir}/defaults/
 %dir %{progdir}/defaults/pref
@@ -107,8 +127,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{progdir}/browser/defaults/profile/
 %{progdir}/browser/defaults/preferences/firefox-openSUSE.js
 %{progdir}/browser/defaults/profile/bookmarks.html
-%{progdir}/browser/searchplugins/
 %{progdir}/distribution
-%{_datadir}/mozilla
 
 %changelog

distribution.ini.in

@@ -1,7 +1,10 @@
 [Global]
 id=openSUSE
 version=%VERSION%
-about=Firefox for openSUSE
+about=Firefox for %DIST%
 
 [Preferences]
 app.partner.opensuse="opensuse"
+
+[LocalizablePreferences]
+browser.startup.homepage="%HOMEPAGE%"

firefox-suse-default-prefs.js

@@ -10,7 +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", "chrome://susefox/content/susefox.properties");
 pref("startup.homepage_welcome_url", "");
 pref("startup.homepage_override_url", "");