Accepting request 592859 from mozilla:Factory

- recognize Leap 15.0 (boo#1087713)

OBS-URL: https://build.opensuse.org/request/show/592859
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox-branding-openSUSE?expand=0&rev=55
This commit is contained in:
Dominique Leuenberger 2018-04-05 13:31:00 +00:00 committed by Git OBS Bridge
commit f9a996ac2d
2 changed files with 15 additions and 6 deletions

View File

@ -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 Mon Jun 5 07:19:51 UTC 2017 - wr@rosenauer.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package MozillaFirefox-branding-openSUSE # 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 # Copyright (c) 2008-2013 Wolfgang Rosenauer
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -24,7 +24,7 @@ BuildRequires: zip
Version: 45 Version: 45
Release: 0 Release: 0
Summary: openSUSE branding of MozillaFirefox 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 Group: Productivity/Networking/Web/Browsers
Url: http://www.opensuse.org Url: http://www.opensuse.org
Source: susefox-20120626.tar.bz2 Source: susefox-20120626.tar.bz2
@ -47,7 +47,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version == 1315 %if %suse_version == 1315
# Leap 42 # Leap 42
%global distname openSUSE Leap
%if %sle_version == 120100 %if %sle_version == 120100
%global suseversion 42.1 %global suseversion 42.1
%else %else
@ -59,16 +58,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%endif %endif
%endif %endif
%endif %endif
%global prjname Leap:%{suseversion}
%else %else
%global distname openSUSE %if %suse_version >= 1550
%if %suse_version >= 1330
# Tumbleweed # Tumbleweed
%global suseversion Tumbleweed %global suseversion Tumbleweed
%else %else
%global suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null) %global suseversion %(echo -e "scale=1\\n%{suse_version}/100" | bc 2>/dev/null)
%endif %endif
%endif
# Leap or not
%if 0%{?sle_version}
%global prjname Leap:%{suseversion}
%global distname openSUSE Leap
%else
%global prjname %{suseversion} %global prjname %{suseversion}
%global distname openSUSE
%endif %endif
%global homepage https://www.opensuse.org/searchPage/ %global homepage https://www.opensuse.org/searchPage/