From 819dcf57627427921a2c7af96c366d396e48b09042ab152f73e86e595749cf4e Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Fri, 4 Oct 2019 09:42:25 +0000
Subject: [PATCH] - use multibuild to provide branding package for  
 MozillaFirefox and firefox-esr

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=141
---
 MozillaFirefox-branding-openSUSE.changes |  5 ++--
 MozillaFirefox-branding-openSUSE.spec    | 35 ++++++++++++++++--------
 _multibuild                              |  4 +++
 distribution.ini.in                      |  2 +-
 4 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 _multibuild

diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes
index 4e94211..7954315 100644
--- a/MozillaFirefox-branding-openSUSE.changes
+++ b/MozillaFirefox-branding-openSUSE.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
-Thu Oct  3 09:07:01 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
+Fri Oct  4 08:12:01 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
 
-- do not provide branding for firefox-esr anymore
 - removed extensions preferences (moved to core package)
+- use multibuild to provide branding package for
+  MozillaFirefox and firefox-esr
 
 -------------------------------------------------------------------
 Mon Sep  9 09:35:46 UTC 2019 - Wolfgang Rosenauer <wr@rosenauer.org>
diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec
index 542f91b..cc7a8fc 100644
--- a/MozillaFirefox-branding-openSUSE.spec
+++ b/MozillaFirefox-branding-openSUSE.spec
@@ -1,8 +1,8 @@
 #
-# spec file for package MozillaFirefox-branding-openSUSE
+# spec file for package MozillaFirefox
 #
 # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2008-2013 Wolfgang Rosenauer
+# Copyright (c) 2008-2019 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,11 +17,25 @@
 #
 
 
-Name:           MozillaFirefox-branding-openSUSE
+%define pkgname @BUILD_FLAVOR@
+
+%if "%{pkgname}" == "MozillaFirefox-branding-openSUSE"
+%define targetpkg MozillaFirefox
+%define progdir %{_libdir}/firefox
+%define appname Firefox
+%endif
+
+%if "%{pkgname}" == "firefox-esr-branding-openSUSE"
+%define targetpkg firefox-esr
+%define progdir %{_libdir}/firefox-esr
+%define appname Firefox ESR
+%endif
+
+Name:           %{pkgname}
 BuildRequires:  bc
 BuildRequires:  unzip
 BuildRequires:  zip
-Version:        60
+Version:        68
 Release:        0
 Summary:        openSUSE branding of MozillaFirefox
 License:        BSD-3-Clause AND GPL-2.0-or-later
@@ -33,13 +47,12 @@ Source2:        all-openSUSE.js
 Source3:        firefox-suse-default-prefs.js
 Source4:        firefox.schemas
 Source5:        distribution.ini.in
-Source6:        %{name}-COPYING
-Supplements:    packageand(MozillaFirefox:branding-openSUSE)
-Provides:       MozillaFirefox-branding = %{version}
-Conflicts:      otherproviders(MozillaFirefox-branding)
+Source6:        MozillaFirefox-branding-openSUSE-COPYING
+Supplements:    packageand(%{targetpkg}:branding-openSUSE)
+Provides:       %{targetpkg}-branding = %{version}
+Conflicts:      otherproviders(%{targetpkg}-branding)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%global progdir    %{_libdir}/firefox
 %global libgssapi  libgssapi_krb5.so.2
 
 %global suseversion undefined
@@ -64,7 +77,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
   %else
     %if %sle_version == 150100
       %global suseversion 15.1
-    %else 
+    %else
       %if %sle_version == 150200
         %global suseversion 15.2
       %endif
@@ -119,6 +132,7 @@ install -m 0644 %{SOURCE2} %{buildroot}%{progdir}/defaults/pref/
 # distribution.ini -- openSUSE bookmarks, homepage and Mozilla partner info
 sed -e 's,%%VERSION%%,%{suseversion},g
 s,%%HOMEPAGE%%,%{homepage},g
+s,%%FLAVOR%%,%{appname},g
 s,%%DIST%%,%{distname},g' \
     %{SOURCE5} > distribution.ini
 
@@ -147,7 +161,6 @@ cp -r susefox\@opensuse.org \
 %doc ../COPYING
 %{_datadir}/mozilla
 %endif
-
 %{progdir}
 
 %changelog
diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..a36ce45
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,4 @@
+<multibuild>
+  <package>MozillaFirefox-branding-openSUSE</package>
+  <package>firefox-esr-branding-openSUSE</package>
+</multibuild>
diff --git a/distribution.ini.in b/distribution.ini.in
index 149a43c..ba7ffaa 100644
--- a/distribution.ini.in
+++ b/distribution.ini.in
@@ -1,7 +1,7 @@
 [Global]
 id=openSUSE
 version=%VERSION%
-about=Firefox for %DIST%
+about=%FLAVOR% for %DIST%
 
 [Preferences]
 app.partner.opensuse="opensuse"