diff --git a/installation-images-16.5.tar.xz b/installation-images-16.5.tar.xz deleted file mode 100644 index 0d6baaf..0000000 --- a/installation-images-16.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5747260aea17f02de40049f2bfb3fea2bc7203b2f1ead1fee30dbfe788bbb323 -size 177988 diff --git a/installation-images-16.6.tar.xz b/installation-images-16.6.tar.xz new file mode 100644 index 0000000..a2d0316 --- /dev/null +++ b/installation-images-16.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a88ba9ae535d94ca974b26d11f54dea3c2fffc9bb7bb8b3d7eae4e1ebce10d5 +size 178024 diff --git a/installation-images.changes b/installation-images.changes index 9dfb82d..e0205a3 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -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 diff --git a/installation-images.spec b/installation-images.spec index 51d86b8..d5ae6e6 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -57,20 +57,21 @@ ExclusiveArch: do_not_build %if 0%{?is_opensuse} %define theme openSUSE %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}" == "" %error "bad version string" %endif %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 -%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 %else %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 -%define net_repo http://download.opensuse.org/tumbleweed/repo/oss +%define net_repo https://download.opensuse.org/tumbleweed/repo/oss %endif %endif %endif @@ -639,7 +640,7 @@ ExcludeArch: %arm Summary: Installation Image Files for %theme License: GPL-2.0+ Group: Metapackages -Version: 16.5 +Version: 16.6 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images)