diff --git a/list-common.sh b/list-common.sh index 9f3f948..555ca4b 100644 --- a/list-common.sh +++ b/list-common.sh @@ -70,7 +70,6 @@ buildignore xorg-x11-Xvnc buildignore cabextract buildignore sssd buildignore db-utils -buildignore deltarpm buildignore dnsmasq buildignore fribidi buildignore ipmitool diff --git a/list-x11.sh b/list-x11.sh index c10bbf6..f92fead 100644 --- a/list-x11.sh +++ b/list-x11.sh @@ -46,6 +46,9 @@ install midori # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD buildignore cyrus-sasl +# Moved here from list-common.sh. Needed by createrepo_c, which is needed for libzypp-plugin-appdata +buildignore deltarpm + # Previously required by rest_cd_x11 install patterns-xfce-xfce_basis installPattern xfce_basis diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index b61ad50..732810c 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -181,8 +181,6 @@ - - diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 85c8ddf..b15b0da 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -181,8 +181,6 @@ - - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 07a6427..c757a5e 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -181,8 +181,6 @@ - - @@ -487,6 +485,8 @@ + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index d91e08e..de95d52 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 26 12:08:16 UTC 2019 - Fabian Vogt + +- Move deltarpm ignore to list-x11 to allow libzypp-plugin-appdata + elsewhere + ------------------------------------------------------------------- Fri Jun 28 06:21:43 UTC 2019 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index f3f1289..2458be4 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -181,8 +181,6 @@ - - diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index f2445f7..c165192 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -181,8 +181,6 @@ - - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index 7dc02e2..86e9cd0 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -181,8 +181,6 @@ - - @@ -487,6 +485,8 @@ + + diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index d232c6a..56473c9 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -181,8 +181,6 @@ - -