Steffen Winterfeldt 2020-08-13 15:06:29 +00:00 committed by Git OBS Bridge
parent e8d00068b6
commit 0b6ca4918f
4 changed files with 17 additions and 9 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5747260aea17f02de40049f2bfb3fea2bc7203b2f1ead1fee30dbfe788bbb323
size 177988

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a88ba9ae535d94ca974b26d11f54dea3c2fffc9bb7bb8b3d7eae4e1ebce10d5
size 178024

View File

@ -1,3 +1,10 @@
--------------------------------------------------------------------
Thu Aug 13 15:00:24 UTC 2020 - wfeldt@opensuse.org
- merge gh#openSUSE/installation-images#406
- use $releasever in repo URL (bsc#1171018)
- 16.6
-------------------------------------------------------------------- --------------------------------------------------------------------
Wed Aug 12 11:50:53 UTC 2020 - wfeldt@opensuse.org Wed Aug 12 11:50:53 UTC 2020 - wfeldt@opensuse.org

View File

@ -57,20 +57,21 @@ ExclusiveArch: do_not_build
%if 0%{?is_opensuse} %if 0%{?is_opensuse}
%define theme openSUSE %define theme openSUSE
%if 0%{?sle_version} %if 0%{?sle_version}
%define the_version %(echo %sle_version | sed -Ee 's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/') # define the_version %(echo %sle_version | sed -Ee 's/^([0-9][0-9])(0|([0-9]))([0-9]).*/\\1.\\3\\4/')
%define the_version \\$releasever
%if "%{the_version}" == "" %if "%{the_version}" == ""
%error "bad version string" %error "bad version string"
%endif %endif
%ifarch aarch64 ppc64 ppc64le %ifarch aarch64 ppc64 ppc64le
%define net_repo http://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/ %define net_repo https://download.opensuse.org/ports/%{the_arch}/distribution/leap/%{the_version}/repo/oss/
%else %else
%define net_repo http://download.opensuse.org/distribution/leap/%{the_version}/repo/oss %define net_repo https://download.opensuse.org/distribution/leap/%{the_version}/repo/oss
%endif %endif
%else %else
%ifarch aarch64 ppc64 ppc64le %ifarch aarch64 ppc64 ppc64le
%define net_repo http://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/ %define net_repo https://download.opensuse.org/ports/%{the_arch}/tumbleweed/repo/oss/
%else %else
%define net_repo http://download.opensuse.org/tumbleweed/repo/oss %define net_repo https://download.opensuse.org/tumbleweed/repo/oss
%endif %endif
%endif %endif
%endif %endif
@ -639,7 +640,7 @@ ExcludeArch: %arm
Summary: Installation Image Files for %theme Summary: Installation Image Files for %theme
License: GPL-2.0+ License: GPL-2.0+
Group: Metapackages Group: Metapackages
Version: 16.5 Version: 16.6
Release: 0 Release: 0
Provides: installation-images = %version-%release Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images) Conflicts: otherproviders(installation-images)