Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2018-01-28 00:37:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "branding-openSUSE" Sun Jan 28 00:37:12 2018 rev:94 rq:568890 version:13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2017-11-25 08:40:31.322929215 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2018-01-28 00:37:14.675614278 +0100 @@ -1,0 +2,6 @@ +Wed Jan 24 09:26:38 UTC 2018 - dims...@opensuse.org + +- Fixup product version for Leap based on sle_version, and for + Tumbleweed set it to 'openSUSE Tumbleweed'. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/kde-branding-openSUSE.changes 2017-11-25 08:40:32.130899777 +0100 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/kde-branding-openSUSE.changes 2018-01-28 00:37:15.743564528 +0100 @@ -2 +2 @@ -Thu Nov 23 13:39:39 UTC 2017 - rbr...@suse.com +Wed Jan 24 09:26:38 UTC 2018 - dims...@opensuse.org @@ -4,2 +4,2 @@ -- Replace references to /var/adm/fillup-templates with new - %_fillupdir macro (boo#1069468) +- Fixup product version for Leap based on sle_version, and for + Tumbleweed set it to 'openSUSE Tumbleweed'. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.XWnENr/_old 2018-01-28 00:37:17.523481609 +0100 +++ /var/tmp/diff_new_pack.XWnENr/_new 2018-01-28 00:37:17.523481609 +0100 @@ -1,7 +1,7 @@ # # spec file for package branding-openSUSE # -# 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 @@ -157,7 +157,16 @@ cp openSUSE/gfxboot/$i gfx/openSUSE/$i done pushd gfx/openSUSE -sed -i -e "s,product=.*,product=openSUSE Leap %{version}," config +%if 0%{?sle_version} +# If a sle_version is defined, then this must be Leap +MAJOR=$((%{sle_version} / 10000)) +MINOR=$(($((%{sle_version} % 10000)) / 100)) +PRODUCT="openSUSE Leap ${MAJOR}.${MINOR}" +%else +# otherwise it must be Tumbleweed +PRODUCT="openSUSE Tumbleweed" +%endif +sed -i -e "s,product=.*,product=${PRODUCT}," config perl -pi -e 's/^(welcome=).*/${1}3/' src/gfxboot.cfg export PATH=/usr/sbin:$PATH ++++++ kde-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.XWnENr/_old 2018-01-28 00:37:17.543480678 +0100 +++ /var/tmp/diff_new_pack.XWnENr/_new 2018-01-28 00:37:17.543480678 +0100 @@ -1,7 +1,7 @@ # # spec file for package kde-branding-openSUSE # -# 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