From 9d290e543a017ba896bc14550a224880ce2e630ce6f7e5a41b6de43972015f98 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 12 Mar 2019 12:17:19 +0000 Subject: [PATCH] Accepting request 684255 from home:mauriziogalli:branches:Virtualization:Appliances:Images:openSUSE-Tumbleweed - Moved "buildignore cyrus-sasl" from list-common.sh. cyrus-sasl is a required dependency of Pidgin in Xfce Live CD - Cleaned up dependencies in list-xfce.sh - Added evince as temporary replacement for xreader - Added gparted OBS-URL: https://build.opensuse.org/request/show/684255 OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=24 --- list-common.sh | 4 +++- list-gnome.sh | 3 +++ list-kde.sh | 3 +++ list-x11.sh | 3 +++ list-xfce.sh | 20 +++++++++----------- livecd-leap-gnome.kiwi | 4 ++-- livecd-leap-kde.kiwi | 4 ++-- livecd-leap-x11.kiwi | 4 ++-- livecd-openSUSE.changes | 9 +++++++++ livecd-tumbleweed-gnome.kiwi | 4 ++-- livecd-tumbleweed-kde.kiwi | 4 ++-- livecd-tumbleweed-x11.kiwi | 4 ++-- livecd-tumbleweed-xfce.kiwi | 24 ++++++------------------ 13 files changed, 48 insertions(+), 42 deletions(-) diff --git a/list-common.sh b/list-common.sh index 06e1842..3f7023b 100644 --- a/list-common.sh +++ b/list-common.sh @@ -110,7 +110,9 @@ buildignore gnome-keyring-pam buildignore apparmor-docs buildignore mutt-doc -buildignore cyrus-sasl + +# Do not buildignore here. Needed by pidgin in Xfce Live CD. +# buildignore cyrus-sasl # Pulls in libgnustep buildignore unar diff --git a/list-gnome.sh b/list-gnome.sh index f565e46..9b8ee84 100644 --- a/list-gnome.sh +++ b/list-gnome.sh @@ -65,3 +65,6 @@ buildignore noto-coloremoji-fonts buildignore gnome-weather install gparted + +# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD +buildignore cyrus-sasl diff --git a/list-kde.sh b/list-kde.sh index c850ef9..2fd5b41 100644 --- a/list-kde.sh +++ b/list-kde.sh @@ -58,3 +58,6 @@ buildignore hugin buildignore gimp-lang install partitionmanager + +# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD +buildignore cyrus-sasl diff --git a/list-x11.sh b/list-x11.sh index 64ef004..ffd7a9c 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -45,3 +45,6 @@ buildignore vim-data install gparted install midori + +# Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD +buildignore cyrus-sasl diff --git a/list-xfce.sh b/list-xfce.sh index 3fcfd10..f8abe1f 100644 --- a/list-xfce.sh +++ b/list-xfce.sh @@ -6,7 +6,6 @@ installPattern rest_cd_core install patterns-xfce-xfce installPattern xfce install openSUSE-release-livecd-xfce -buildignore release-notes-openSUSE buildignore gnome-themes-accessibility buildignore xlockmore buildignore unzip-doc @@ -16,7 +15,6 @@ buildignore gtk2-immodule-vietnamese buildignore gtk3-immodule-inuktitut buildignore gtk3-immodule-thai buildignore gtk3-immodule-vietnamese -buildignore ImageMagick buildignore awesfx buildignore sbl buildignore open-vm-tools @@ -27,16 +25,10 @@ install skelcd-openSUSE # Needed for README.BETA install setxkbmap # Needed by yast2-keyboard install yast2-qt-branding-openSUSE buildignore aspell-en -buildignore avahi buildignore fprintd install libxslt-tools archive xfce-changecontrolxml.tar.xz -# Remove xfce pattern bloat -buildignore sound-juicer -buildignore remmina -buildignore gnome-games - # Remove useless xfce panel plugins buildignore xfce4-panel-plugin-xkb buildignore xfce4-panel-plugin-notes @@ -44,6 +36,12 @@ buildignore xfce4-panel-plugin-notes # Remove Libreoffice as it's too big buildignore libreoffice -# PackageKit is not needed -buildignore PackageKit -buildignore PackageKit-gstreamer-plugin +# Pulls in sane-backends +buildignore simple-scan + +# Add useful extras +install gparted +install evince + +# Ignore xreader for now +buildignore xreader diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index 58be251..89e96f6 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -233,8 +233,6 @@ - - @@ -387,6 +385,8 @@ + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 08599e1..c62f760 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -233,8 +233,6 @@ - - @@ -386,6 +384,8 @@ + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 1d886bd..d35c5d8 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -233,8 +233,6 @@ - - @@ -383,6 +381,8 @@ + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 8fa6e52..fc5ac4d 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Mar 12 09:13:58 UTC 2019 - Maurizio Galli + +- Moved "buildignore cyrus-sasl" from list-common.sh. + cyrus-sasl is a required dependency of Pidgin in Xfce Live CD +- Cleaned up dependencies in list-xfce.sh +- Added evince as temporary replacement for xreader +- Added gparted + ------------------------------------------------------------------- Thu Mar 7 14:01:41 UTC 2019 - Maurizio Galli diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 0f18924..d31e3de 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -233,8 +233,6 @@ - - @@ -387,6 +385,8 @@ + + diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index b3fd4e6..10a263b 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -233,8 +233,6 @@ - - @@ -386,6 +384,8 @@ + + diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 1c7ce8f..5481d91 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -233,8 +233,6 @@ - - @@ -383,6 +381,8 @@ + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index cd3853a..023eb94 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -233,8 +233,6 @@ - - @@ -315,8 +313,6 @@ - - @@ -335,8 +331,6 @@ - - @@ -353,28 +347,22 @@ - - - - - - - - - - - - + + + + + +