Accepting request 827556 from home:favogt:branches:openSUSE:Factory:Live

- list-kde: Add back okular-lang, kate-lang and gwenview
- list-kde: Drop kdoctools and deps
- config.sh: Forcibly remove adwaita-icon-theme for kde

OBS-URL: https://build.opensuse.org/request/show/827556
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=74
This commit is contained in:
Fabian Vogt 2020-08-18 10:24:40 +00:00 committed by Git OBS Bridge
parent 217678dfa5
commit 73fb48845e
12 changed files with 132 additions and 113 deletions

View File

@ -32,6 +32,10 @@ rpm -q wodim && rpm -e --nodeps wodim
# Actually a hack: xrdb requires this, but on livecds it's not used
rpm -qa | grep "^cpp" | xargs -r rpm -e --nodeps
# GTK 3 hard-requires this for some reason. The only GTK3 application is Firefox,
# which has its own icons and we have breeze for the rest.
[ "$desktop" = "kde" -o "$desktop" = "x11" ] && rpm -e --nodeps adwaita-icon-theme
#--------------------------------------
# enable and disable services

View File

@ -44,7 +44,7 @@ buildignore patterns-office-office_opt
buildignore patterns-base-x11_opt
buildignore make
buildignore netpbm
buildignore p7zip
buildignore p7zip-full
buildignore busybox-static
buildignore inxi
@ -242,10 +242,8 @@ install util-linux
install wireless-regdb
install wpa_supplicant
install xf86-video-ark
install xf86-video-ast
install xf86-video-ati
install xf86-video-chips
install xf86-video-cirrus
install xf86-video-fbdev
install xf86-video-glint
install xf86-video-i128
@ -268,16 +266,16 @@ install xf86-video-voodoo
install xfsdump
install xfsprogs
install xz
install yast2-trans-cs
install yast2-trans-da
#install yast2-trans-cs
#install yast2-trans-da
install yast2-trans-de
install yast2-trans-es
install yast2-trans-ja
install yast2-trans-pl
install yast2-trans-ru
install yast2-trans-sv
install yast2-trans-zh_CN
install yast2-trans-zh_TW
#install yast2-trans-es
#install yast2-trans-ja
#install yast2-trans-pl
#install yast2-trans-ru
#install yast2-trans-sv
#install yast2-trans-zh_CN
#install yast2-trans-zh_TW
install zd1211-firmware
install zip

View File

@ -26,7 +26,6 @@ buildignore gnome-keyring
source "$PWD/list-installer.sh"
buildignore oxygen5-icon-theme-large
buildignore gwenview5
# Needs ibus data files and color emoji fonts, too big.
buildignore plasma5-desktop-emojier
@ -42,6 +41,10 @@ buildignore patterns-kde-kde_games
buildignore patterns-kde-kde_utilities
install kcharselect
# Pulls in docbook and friends, ~50MiB.
# Excludedocs is enabled, so documentation is broken anyway
buildignore kdoctools
# Moved here from list-common.sh, too big for x11
install xf86-video-vmware i686,x86_64
@ -53,7 +56,6 @@ buildignore gdb
buildignore gimp-lang
buildignore hugin
buildignore icewm
buildignore kate-lang
buildignore kmahjongg-lang
buildignore konversation-lang
buildignore libproxy1-pacrunner-webkit

View File

@ -47,7 +47,9 @@ buildignore avahi
buildignore fprintd
buildignore accountsservice
buildignore MozillaFirefox
buildignore vim
buildignore vim-data
install vim-small
buildignore tcpdump
install gparted
@ -57,6 +59,14 @@ buildignore gparted-lang
buildignore midori-lang
buildignore iso-codes-lang
buildignore glib2-lang
buildignore thunar-lang
buildignore xfce4-settings-lang
buildignore xfce4-panel-lang
buildignore xfce-terminal-lang
buildignore exo-lang
buildignore xfdesktop-lang
buildignore xfce4-power-manager-lang
buildignore xorg-x11-fonts-legacy
# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
buildignore cyrus-sasl

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
@ -454,8 +443,6 @@
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="oxygen5-icon-theme-large"/>
<ignore name="oxygen5-icon-theme-large"/>
<package name="aaa_base" replaces="gwenview5"/>
<ignore name="gwenview5"/>
<package name="aaa_base" replaces="plasma5-desktop-emojier"/>
<ignore name="plasma5-desktop-emojier"/>
<package name="plasma-nm5"/>
@ -467,6 +454,8 @@
<package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
<ignore name="patterns-kde-kde_utilities"/>
<package name="kcharselect"/>
<package name="aaa_base" replaces="kdoctools"/>
<ignore name="kdoctools"/>
<package name="xf86-video-vmware" arch="i686,x86_64"/>
<package name="aaa_base" replaces="patterns-kde-kde_pim"/>
<ignore name="patterns-kde-kde_pim"/>
@ -480,8 +469,6 @@
<ignore name="hugin"/>
<package name="aaa_base" replaces="icewm"/>
<ignore name="icewm"/>
<package name="aaa_base" replaces="kate-lang"/>
<ignore name="kate-lang"/>
<package name="aaa_base" replaces="kmahjongg-lang"/>
<ignore name="kmahjongg-lang"/>
<package name="aaa_base" replaces="konversation-lang"/>

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
@ -490,8 +479,11 @@
<ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/>
<package name="aaa_base" replaces="vim"/>
<ignore name="vim"/>
<package name="aaa_base" replaces="vim-data"/>
<ignore name="vim-data"/>
<package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/>
<package name="gparted"/>
@ -504,6 +496,22 @@
<ignore name="iso-codes-lang"/>
<package name="aaa_base" replaces="glib2-lang"/>
<ignore name="glib2-lang"/>
<package name="aaa_base" replaces="thunar-lang"/>
<ignore name="thunar-lang"/>
<package name="aaa_base" replaces="xfce4-settings-lang"/>
<ignore name="xfce4-settings-lang"/>
<package name="aaa_base" replaces="xfce4-panel-lang"/>
<ignore name="xfce4-panel-lang"/>
<package name="aaa_base" replaces="xfce-terminal-lang"/>
<ignore name="xfce-terminal-lang"/>
<package name="aaa_base" replaces="exo-lang"/>
<ignore name="exo-lang"/>
<package name="aaa_base" replaces="xfdesktop-lang"/>
<ignore name="xfdesktop-lang"/>
<package name="aaa_base" replaces="xfce4-power-manager-lang"/>
<ignore name="xfce4-power-manager-lang"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="cyrus-sasl"/>
<ignore name="cyrus-sasl"/>
<package name="aaa_base" replaces="deltarpm"/>

View File

@ -1,3 +1,51 @@
-------------------------------------------------------------------
Mon Aug 10 07:38:01 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- config.sh: Forcibly remove adwaita-icon-theme for kde and Rescue CD
-------------------------------------------------------------------
Mon Aug 10 07:01:34 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Drop xorg-x11-fonts-legacy from the rescue CD: hunt for space.
-------------------------------------------------------------------
Mon Aug 3 09:30:59 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- list-kde: Add back okular-lang, kate-lang and gwenview
- list-kde: Drop kdoctools and deps
- config.sh: Forcibly remove adwaita-icon-theme for kde
-------------------------------------------------------------------
Mon Aug 3 07:16:00 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Drop okular-lang from the KDE Live CD - hunting for space
-------------------------------------------------------------------
Mon Jun 15 08:25:41 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Drop thunar-lang from the Rescue CD - more hunt for space.
-------------------------------------------------------------------
Sat Jun 13 16:09:32 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Use vim-small on the rescue cd.
-------------------------------------------------------------------
Fri Jun 12 08:30:05 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Drop yast translations (space constraints).
-------------------------------------------------------------------
Wed Jun 10 13:49:35 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
- Ignore p7zip-full instead of p7zip
-------------------------------------------------------------------
Sat May 9 12:45:00 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- list-common: drop xf86-video-ast and -cirrus: obsoleted by
xorg-x11-server.
-------------------------------------------------------------------
Fri Apr 17 09:25:33 UTC 2020 - Fabian Vogt <fvogt@suse.com>

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
@ -454,8 +443,6 @@
<package name="arabic-kacst-fonts"/>
<package name="aaa_base" replaces="oxygen5-icon-theme-large"/>
<ignore name="oxygen5-icon-theme-large"/>
<package name="aaa_base" replaces="gwenview5"/>
<ignore name="gwenview5"/>
<package name="aaa_base" replaces="plasma5-desktop-emojier"/>
<ignore name="plasma5-desktop-emojier"/>
<package name="plasma-nm5"/>
@ -467,6 +454,8 @@
<package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
<ignore name="patterns-kde-kde_utilities"/>
<package name="kcharselect"/>
<package name="aaa_base" replaces="kdoctools"/>
<ignore name="kdoctools"/>
<package name="xf86-video-vmware" arch="i686,x86_64"/>
<package name="aaa_base" replaces="patterns-kde-kde_pim"/>
<ignore name="patterns-kde-kde_pim"/>
@ -480,8 +469,6 @@
<ignore name="hugin"/>
<package name="aaa_base" replaces="icewm"/>
<ignore name="icewm"/>
<package name="aaa_base" replaces="kate-lang"/>
<ignore name="kate-lang"/>
<package name="aaa_base" replaces="kmahjongg-lang"/>
<ignore name="kmahjongg-lang"/>
<package name="aaa_base" replaces="konversation-lang"/>

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>
@ -490,8 +479,11 @@
<ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/>
<package name="aaa_base" replaces="vim"/>
<ignore name="vim"/>
<package name="aaa_base" replaces="vim-data"/>
<ignore name="vim-data"/>
<package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/>
<package name="gparted"/>
@ -504,6 +496,22 @@
<ignore name="iso-codes-lang"/>
<package name="aaa_base" replaces="glib2-lang"/>
<ignore name="glib2-lang"/>
<package name="aaa_base" replaces="thunar-lang"/>
<ignore name="thunar-lang"/>
<package name="aaa_base" replaces="xfce4-settings-lang"/>
<ignore name="xfce4-settings-lang"/>
<package name="aaa_base" replaces="xfce4-panel-lang"/>
<ignore name="xfce4-panel-lang"/>
<package name="aaa_base" replaces="xfce-terminal-lang"/>
<ignore name="xfce-terminal-lang"/>
<package name="aaa_base" replaces="exo-lang"/>
<ignore name="exo-lang"/>
<package name="aaa_base" replaces="xfdesktop-lang"/>
<ignore name="xfdesktop-lang"/>
<package name="aaa_base" replaces="xfce4-power-manager-lang"/>
<ignore name="xfce4-power-manager-lang"/>
<package name="aaa_base" replaces="xorg-x11-fonts-legacy"/>
<ignore name="xorg-x11-fonts-legacy"/>
<package name="aaa_base" replaces="cyrus-sasl"/>
<ignore name="cyrus-sasl"/>
<package name="aaa_base" replaces="deltarpm"/>

View File

@ -149,8 +149,8 @@
<ignore name="make"/>
<package name="aaa_base" replaces="netpbm"/>
<ignore name="netpbm"/>
<package name="aaa_base" replaces="p7zip"/>
<ignore name="p7zip"/>
<package name="aaa_base" replaces="p7zip-full"/>
<ignore name="p7zip-full"/>
<package name="aaa_base" replaces="busybox-static"/>
<ignore name="busybox-static"/>
<package name="aaa_base" replaces="inxi"/>
@ -362,10 +362,8 @@
<package name="wireless-regdb"/>
<package name="wpa_supplicant"/>
<package name="xf86-video-ark"/>
<package name="xf86-video-ast"/>
<package name="xf86-video-ati"/>
<package name="xf86-video-chips"/>
<package name="xf86-video-cirrus"/>
<package name="xf86-video-fbdev"/>
<package name="xf86-video-glint"/>
<package name="xf86-video-i128"/>
@ -388,16 +386,7 @@
<package name="xfsdump"/>
<package name="xfsprogs"/>
<package name="xz"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-de"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/>
<package name="zip"/>
<package name="aaa_base" replaces="ntp"/>