From 4638193d4ef1ebfb04b133d1ce8b597f3de4e7ac1b44ca8e433e17bf2dcd992b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sun, 5 May 2019 07:32:29 +0000 Subject: [PATCH] - recognize Leap 15 via sle_version (required for >= 15.1) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=132 --- MozillaFirefox-branding-openSUSE.changes | 5 +++ MozillaFirefox-branding-openSUSE.spec | 49 +++++++++++++++--------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/MozillaFirefox-branding-openSUSE.changes b/MozillaFirefox-branding-openSUSE.changes index 14f43a3..b253974 100644 --- a/MozillaFirefox-branding-openSUSE.changes +++ b/MozillaFirefox-branding-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 5 07:31:47 UTC 2019 - Wolfgang Rosenauer + +- recognize Leap 15 via sle_version (required for >= 15.1) + ------------------------------------------------------------------- Tue Apr 23 09:15:55 UTC 2019 - Wolfgang Rosenauer diff --git a/MozillaFirefox-branding-openSUSE.spec b/MozillaFirefox-branding-openSUSE.spec index 20ec967..3178b3c 100644 --- a/MozillaFirefox-branding-openSUSE.spec +++ b/MozillaFirefox-branding-openSUSE.spec @@ -46,33 +46,44 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %global libgssapi libgssapi_krb5.so.2 %if %suse_version == 1315 -# Leap 42 -%if %sle_version == 120100 -%global suseversion 42.1 -%else -%if %sle_version == 120200 -%global suseversion 42.2 -%else -%if %sle_version == 120300 -%global suseversion 42.3 + # Leap 42 + %if %sle_version == 120100 + %global suseversion 42.1 + %else + %if %sle_version == 120200 + %global suseversion 42.2 + %else + %if %sle_version == 120300 + %global suseversion 42.3 + %endif + %endif + %endif %endif +%if %suse_version == 1500 + # Leap 15 + %if %sle_version == 150000 + %global suseversion 15.0 + %else + %if %sle_version == 150100 + %global suseversion 15.1 + %endif + %endif %endif -%endif -%else + %if %suse_version >= 1550 -# Tumbleweed -%global suseversion Tumbleweed + # Tumbleweed + %global suseversion Tumbleweed %else -%global suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null) -%endif + %global suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null) %endif + # Leap or not %if 0%{?sle_version} -%global prjname Leap:%{suseversion} -%global distname openSUSE Leap + %global prjname Leap:%{suseversion} + %global distname openSUSE Leap %else -%global prjname %{suseversion} -%global distname openSUSE + %global prjname %{suseversion} + %global distname openSUSE %endif %global homepage https://www.opensuse.org/searchPage/