Fabian Vogt 2019-10-30 10:55:53 +00:00 committed by Git OBS Bridge
parent bf9a943b0b
commit 36b71b0c56
7 changed files with 7 additions and 7 deletions

View File

@ -19,9 +19,9 @@ set -euxo pipefail
exec | tee /var/log/config.log exec | tee /var/log/config.log
exec 2>&1 exec 2>&1
pl=$(rpmqpack | grep openSUSE-release-livecd-) pl=$(rpmqpack | grep release-livecd-)
# Get the flavor from the installed openSUSE-release-livecd- RPM # Get the flavor from the installed (openSUSE|Leap)-release-livecd- RPM
# as <censored> kiwi does not make the flavor accessible # as <censored> kiwi does not make the flavor accessible
desktop=$(echo "$pl" | awk -F- '{ print $4 }' | tr A-Z a-z) desktop=$(echo "$pl" | awk -F- '{ print $4 }' | tr A-Z a-z)

View File

@ -12,7 +12,6 @@ buildignore akregator
buildignore ImageMagick buildignore ImageMagick
install patterns-kde-kde install patterns-kde-kde
installPattern kde installPattern kde
install openSUSE-release-livecd-kde
install plasma5-workspace-branding-openSUSE install plasma5-workspace-branding-openSUSE
install baloo5-tools install baloo5-tools
install NetworkManager install NetworkManager

View File

@ -3,7 +3,6 @@ buildignore samba-libs
install yast2-trans-stats install yast2-trans-stats
install patterns-xfce-xfce install patterns-xfce-xfce
installPattern xfce installPattern xfce
install openSUSE-release-livecd-xfce
buildignore gnome-themes-accessibility buildignore gnome-themes-accessibility
buildignore xlockmore buildignore xlockmore
buildignore unzip-doc buildignore unzip-doc

View File

@ -435,7 +435,6 @@
<ignore name="ImageMagick"/> <ignore name="ImageMagick"/>
<package name="patterns-kde-kde"/> <package name="patterns-kde-kde"/>
<namedCollection name="kde"/> <namedCollection name="kde"/>
<package name="openSUSE-release-livecd-kde"/>
<package name="plasma5-workspace-branding-openSUSE"/> <package name="plasma5-workspace-branding-openSUSE"/>
<package name="baloo5-tools"/> <package name="baloo5-tools"/>
<package name="NetworkManager"/> <package name="NetworkManager"/>

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 30 10:54:55 UTC 2019 - Fabian Vogt <fvogt@suse.com>
- More adjustments for Leap-release-*
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 30 09:53:50 UTC 2019 - Fabian Vogt <fvogt@suse.com> Wed Oct 30 09:53:50 UTC 2019 - Fabian Vogt <fvogt@suse.com>

View File

@ -435,7 +435,6 @@
<ignore name="ImageMagick"/> <ignore name="ImageMagick"/>
<package name="patterns-kde-kde"/> <package name="patterns-kde-kde"/>
<namedCollection name="kde"/> <namedCollection name="kde"/>
<package name="openSUSE-release-livecd-kde"/>
<package name="plasma5-workspace-branding-openSUSE"/> <package name="plasma5-workspace-branding-openSUSE"/>
<package name="baloo5-tools"/> <package name="baloo5-tools"/>
<package name="NetworkManager"/> <package name="NetworkManager"/>

View File

@ -415,7 +415,6 @@
<package name="yast2-trans-stats"/> <package name="yast2-trans-stats"/>
<package name="patterns-xfce-xfce"/> <package name="patterns-xfce-xfce"/>
<namedCollection name="xfce"/> <namedCollection name="xfce"/>
<package name="openSUSE-release-livecd-xfce"/>
<package name="aaa_base" replaces="gnome-themes-accessibility"/> <package name="aaa_base" replaces="gnome-themes-accessibility"/>
<ignore name="gnome-themes-accessibility"/> <ignore name="gnome-themes-accessibility"/>
<package name="aaa_base" replaces="xlockmore"/> <package name="aaa_base" replaces="xlockmore"/>