From fd02fe3e81a3a9320d04a4e5a717de0bb86e118d7cb38a31fca084eb58855683 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 11 Jul 2016 10:03:08 +0000 Subject: [PATCH] Accepting request 407741 from home:dimstar:Factory - Identify the different Leap versions correctly (up to Leap 42.2) (boo#987969). OBS-URL: https://build.opensuse.org/request/show/407741 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=119 --- MozillaFirefox-branding-openSUSE.changes | 6 ++++++ MozillaFirefox-branding-openSUSE.spec | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index a587d07..f6b9e7d 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 11 09:32:00 UTC 2016 - dimstar@opensuse.org + +- Identify the different Leap versions correctly (up to Leap 42.2) + (boo#987969). + ------------------------------------------------------------------- Fri Dec 18 00:55:52 UTC 2015 - wr@rosenauer.org diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index 45edaab..db92d09 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -1,7 +1,7 @@ # # spec file for package MozillaFirefox-branding-openSUSE # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2008-2013 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -47,8 +47,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define libgssapi libgssapi_krb5.so.2 %if %suse_version == 1315 # Leap 42 -%define suseversion 42.1 %define distname openSUSE Leap +%if %sle_version == 120100 +%define suseversion 42.1 +%else +%if %sle_version == 120200 +%define suseversion 42.2 +%endif +%endif %else %define distname openSUSE %if %suse_version >= 1330