From 1390d5e0d2b7338b3f4edf09d6ae882d6e7f44f91d12991ad39fab3d041239f4 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sun, 1 Apr 2018 09:35:25 +0000
Subject: [PATCH] - recognize Leap 15.0 (boo#1087713)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=128
---
 MozillaFirefox-branding-openSUSE.changes |  5 +++++
 MozillaFirefox-branding-openSUSE.spec    | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes
index 1c2be6b..79372c0 100644
--- a/MozillaFirefox-branding-openSUSE.changes
+++ b/MozillaFirefox-branding-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr  1 09:34:49 UTC 2018 - wr@rosenauer.org
+
+- recognize Leap 15.0 (boo#1087713)
+
 -------------------------------------------------------------------
 Mon Jun  5 07:19:51 UTC 2017 - wr@rosenauer.org
 
diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec
index 0719bf1..4369bbd 100644
--- a/MozillaFirefox-branding-openSUSE.spec
+++ b/MozillaFirefox-branding-openSUSE.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package MozillaFirefox-branding-openSUSE
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2008-2013 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
@@ -24,7 +24,7 @@ BuildRequires:  zip
 Version:        45
 Release:        0
 Summary:        openSUSE branding of MozillaFirefox
-License:        BSD-3-Clause and GPL-2.0+
+License:        BSD-3-Clause AND GPL-2.0-or-later
 Group:          Productivity/Networking/Web/Browsers
 Url:            http://www.opensuse.org
 Source:         susefox-20120626.tar.bz2
@@ -47,7 +47,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if %suse_version == 1315
 # Leap 42
-%global distname openSUSE Leap
 %if %sle_version == 120100
 %global suseversion 42.1
 %else
@@ -59,16 +58,21 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %endif
 %endif
 %endif
-%global prjname Leap:%{suseversion}
 %else
-%global distname openSUSE
-%if %suse_version >= 1330
+%if %suse_version >= 1550
 # Tumbleweed
 %global suseversion Tumbleweed
 %else
 %global suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null)
 %endif
+%endif
+# Leap or not
+%if 0%{?sle_version}
+%global prjname Leap:%{suseversion}
+%global distname openSUSE Leap
+%else
 %global prjname %{suseversion}
+%global distname openSUSE
 %endif
 
 %global homepage      https://www.opensuse.org/searchPage/