From b2001f215e7a4acde2c5444c65c61d6a01d32271911dc01de26a3325fad4ef44 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 10 Jun 2020 13:51:09 +0000
Subject: [PATCH] - Ignore p7zip-full instead of p7zip

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=108
---
 list-common.sh               | 2 +-
 livecd-leap-gnome.kiwi       | 4 ++--
 livecd-leap-kde.kiwi         | 4 ++--
 livecd-leap-x11.kiwi         | 4 ++--
 livecd-openSUSE.changes      | 5 +++++
 livecd-tumbleweed-gnome.kiwi | 4 ++--
 livecd-tumbleweed-kde.kiwi   | 4 ++--
 livecd-tumbleweed-x11.kiwi   | 4 ++--
 livecd-tumbleweed-xfce.kiwi  | 4 ++--
 9 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index dd818dd..afa12cc 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -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
 
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index c5d627a..c3a0bfe 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -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"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index d1b30ab..17dcc12 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -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"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 3c3647c..ba240e2 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -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"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 67a1eda..70dedc7 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index ea4db47..f22c8f7 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -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"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 7711575..7d7fca2 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -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"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 130b177..8ec9e50 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -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"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 0268b92..bc7563a 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -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"/>