Hello community, here is the log from the commit of package live-net-installer for openSUSE:Factory checked in at 2018-01-16 09:43:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/live-net-installer (Old) and /work/SRC/openSUSE:Factory/.live-net-installer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "live-net-installer" Tue Jan 16 09:43:19 2018 rev:2 rq:565808 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/live-net-installer/live-net-installer.changes 2017-09-29 11:57:13.551239840 +0200 +++ /work/SRC/openSUSE:Factory/.live-net-installer.new/live-net-installer.changes 2018-01-16 09:43:20.606956786 +0100 @@ -1,0 +2,6 @@ +Thu Jan 11 14:18:42 UTC 2018 - fv...@suse.com + +- Support Leap 15.0 by detecting the OS and setting the RepoUrl + appropriately + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ live-net-installer.spec ++++++ --- /var/tmp/diff_new_pack.6tksWG/_old 2018-01-16 09:43:21.542912976 +0100 +++ /var/tmp/diff_new_pack.6tksWG/_new 2018-01-16 09:43:21.542912976 +0100 @@ -1,7 +1,7 @@ # # spec file for package live-net-installer # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,6 +41,28 @@ %setup -q -T -c cp %{SOURCE3} . +URL= +%if 0%{?is_opensuse} +# Tumbleweed? +%if 0%{?suse_version} >= 1550 && !0%{?sle_version} +URL="http://download.opensuse.org/tumbleweed/repo/oss" +%endif + +# Leap? +%if 0%{?sle_version} +leap="$(expr %{?sle_version} / 100)" +leap_min="$(expr ${leap} % 100)" || true # leap_min can be 0, which causes expr to exit(1) +leap_maj="$(expr ${leap} / 100)" +URL="http://download.opensuse.org/distribution/leap/${leap_maj}.${leap_min}/repo/oss" +%endif +%endif + +if [ -z "$URL" ]; then + echo "Building for unknown distro - no repository specified." + exit 1 +fi +sed -i"" "s=@URL@=${URL}=" %{SOURCE1} + %build %install ++++++ start-install.sh ++++++ --- /var/tmp/diff_new_pack.6tksWG/_old 2018-01-16 09:43:21.614909606 +0100 +++ /var/tmp/diff_new_pack.6tksWG/_new 2018-01-16 09:43:21.614909606 +0100 @@ -9,8 +9,9 @@ #Don't load the KDE platform theme, to avoid messing with accelerator mnemonics (boo#1045798) export KDE_SESSION_VERSION=0 +#The URL placeholder gets filled by live-net-installer.spec cat >/etc/install.inf <<EOF -ZyppRepoURL: http://download.opensuse.org/tumbleweed/repo/oss +ZyppRepoURL: @URL@ InstMode: net # disable self-update, it expects inst-sys environment and doesn't work from Live CD SelfUpdate: 0