From 60bae2cdaf8e384b42ef4c33aaaea18cb0b5b114234e7dc3bd7fc5a8549d36a4 Mon Sep 17 00:00:00 2001
From: Staging Bot <obsbot+stagingbot@suse.de>
Date: Tue, 1 Sep 2020 15:42:59 +0000
Subject: [PATCH] Automatic update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000product?expand=0&rev=2374
---
 dvd.group                     | 3 +--
 openSUSE-dvd5-dvd-x86_64.kiwi | 3 +--
 unsorted.yml                  | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dvd.group b/dvd.group
index 793b0754..89a4c437 100644
--- a/dvd.group
+++ b/dvd.group
@@ -5360,8 +5360,7 @@
     <package name="gtk2-tools-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="guestfs-data" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="ibus-gtk-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="java-15-openjdk-headless" supportstatus="unsupported"/> <!-- reason: dvd:apache-parent -->
-    <package name="kernel-firmware" supportstatus="unsupported"/> <!-- reason: dvd:bcm20702a1-firmware -->
+    <package name="java-14-openjdk-headless" supportstatus="unsupported"/> <!-- reason: dvd:apache-parent -->
     <package name="krb5-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_cd_core -->
     <package name="ldmtool" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="lib389" supportstatus="unsupported"/> <!-- reason: dvd:patterns-server-directory_server -->
diff --git a/openSUSE-dvd5-dvd-x86_64.kiwi b/openSUSE-dvd5-dvd-x86_64.kiwi
index 0b5facd4..cbf753b1 100644
--- a/openSUSE-dvd5-dvd-x86_64.kiwi
+++ b/openSUSE-dvd5-dvd-x86_64.kiwi
@@ -1074,7 +1074,7 @@
       <repopackage name="iw"/>
       <repopackage name="java-11-openjdk"/>
       <repopackage name="java-11-openjdk-headless"/>
-      <repopackage name="java-15-openjdk-headless" arch="x86_64"/>
+      <repopackage name="java-14-openjdk-headless" arch="x86_64"/>
       <repopackage name="javapackages-filesystem"/>
       <repopackage name="javapackages-tools"/>
       <repopackage name="jfsutils"/>
@@ -1197,7 +1197,6 @@
       <repopackage name="kdump"/>
       <repopackage name="kernel-default"/>
       <repopackage name="kernel-docs"/>
-      <repopackage name="kernel-firmware" arch="x86_64"/>
       <repopackage name="kernel-firmware-all"/>
       <repopackage name="kernel-firmware-amdgpu"/>
       <repopackage name="kernel-firmware-ath10k"/>
diff --git a/unsorted.yml b/unsorted.yml
index 936b5d8d..088d1754 100644
--- a/unsorted.yml
+++ b/unsorted.yml
@@ -6524,7 +6524,7 @@ unsorted:
   - java-14-openjdk-accessibility 
   - java-14-openjdk-demo 
   - java-14-openjdk-devel 
-  - java-14-openjdk-headless 
+  - java-14-openjdk-headless: [i586] 
   - java-14-openjdk-javadoc 
   - java-14-openjdk-jmods 
   - java-14-openjdk-src 
@@ -6532,7 +6532,7 @@ unsorted:
   - java-15-openjdk-accessibility 
   - java-15-openjdk-demo 
   - java-15-openjdk-devel 
-  - java-15-openjdk-headless: [i586] 
+  - java-15-openjdk-headless 
   - java-15-openjdk-javadoc 
   - java-15-openjdk-jmods 
   - java-15-openjdk-src 
@@ -7117,7 +7117,7 @@ unsorted:
   - kernel-default-devel 
   - kernel-devel 
   - kernel-docs-html 
-  - kernel-firmware: [i586] 
+  - kernel-firmware 
   - kernel-kvmsmall: [x86_64] 
   - kernel-kvmsmall-devel: [x86_64] 
   - kernel-macros