From bc6da9ff6135dd29a5cf8ba8ab2a334c4a0d03dc7f2d5cc76d025187b5154dd9 Mon Sep 17 00:00:00 2001
From: Ana Guerrero <ana.guerrero+factory@suse.com>
Date: Fri, 8 Dec 2023 21:31:17 +0000
Subject: [PATCH] Accepting request 1129132 from home:dimstar:Factory

OBS-URL: https://build.opensuse.org/request/show/1129132
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=257
---
 NON_FTP_PACKAGES.group   | 266 ---------------------------------------
 groups.yml               |  70 +----------
 openSUSE-release.spec.in |   3 +
 3 files changed, 4 insertions(+), 335 deletions(-)

diff --git a/NON_FTP_PACKAGES.group b/NON_FTP_PACKAGES.group
index 83dcde3..6356490 100644
--- a/NON_FTP_PACKAGES.group
+++ b/NON_FTP_PACKAGES.group
@@ -4,18 +4,7 @@
   <packagelist relationship="requires">
     <package name="openSUSE-images"/>
     <package name="openSUSE-driverupdate"/>
-    <package name="openSUSE-release-livecd-gnome"/>
-    <package name="openSUSE-release-livecd-kde"/>
-    <package name="openSUSE-release-livecd-kde3"/>
-    <package name="openSUSE-release-livecd-xfce"/>
     <package name="openSUSE-release-mini"/>
-    <package name="openSUSE-release-usb-gnome"/>
-    <package name="openSUSE-release-usb-kde"/>
-    <package name="openSUSE-release-dvd"/>
-    <package name="openSUSE-release-appliance"/>
-    <package name="openSUSE-release-dvd-biarch"/>
-    <package name="openSUSE-release-dvd-promo"/>
-    <package name="openSUSE-release-dvd-promo"/>
     <package name="desktop-data-SLED"/>
     <package name="desktop-data-SLED-extra-gnome"/>
     <package name="desktop-data-SLES-extra-gnome"/>
@@ -69,20 +58,9 @@
     <package name="openSUSE-Addon-NonOss-release"/>
     <package name="openSUSE-Addon-NonOss-release-biarch"/>
     <package name="openSUSE-Addon-NonOss-release-ftp"/>
-    <package name="openSUSE-release-livetree-gnome"/>
-    <package name="openSUSE-release-livetree-kde"/>
     <package name="openSUSE-Addon-NonOss-release-addon-nonoss"/>
-    <package name="openSUSE-LiveCD-release"/>
-    <package name="openSUSE-LiveCD-release-livecd-gnome"/>
-    <package name="openSUSE-LiveCD-release-livecd-kde"/>
-    <package name="openSUSE-Promo-release"/>
-    <package name="openSUSE-Promo-release-promodvd"/>
     <package name="openSUSE-Addon-NonOss-release-ppc"/>
     <package name="skelcd-openSUSE-non-OSS"/>
-    <package name="openSUSE-release-livecd-x11"/>
-    <package name="openSUSE-release-usb-x11"/>
-    <package name="openSUSE-release-promodvd"/>
-    <package name="openSUSE-release-livetree"/>
     <package name="promo-dvd-parts"/>
     <package name="kiwi-promo-dvd-parts"/>
     <package name="kiwi-profiled-livecd-kde"/>
@@ -114,234 +92,7 @@
     <package name="package-lists-openSUSE-GNOME-cd"/>
     <package name="package-lists-openSUSE-KDE-cd"/>
     <package name="package-lists-openSUSE-images"/>
-    <package name="cpp41"/>
-    <package name="cpp43"/>
-    <package name="cpp47"/>
-    <package name="cross-armv5tel-gcc47-icecream-backend"/>
-    <package name="cross-armv7hl-gcc47-icecream-backend"/>
-    <package name="cross-hppa-gcc47-icecream-backend"/>
-    <package name="cross-i386-gcc47-icecream-backend"/>
-    <package name="cross-ia64-gcc47-icecream-backend"/>
-    <package name="cross-ppc-gcc47-icecream-backend"/>
-    <package name="cross-ppc64-gcc47-icecream-backend"/>
-    <package name="cross-s390-gcc47-icecream-backend"/>
-    <package name="cross-s390x-gcc47-icecream-backend"/>
-    <package name="cross-x86_64-gcc47-icecream-backend"/>
-    <package name="gcc41"/>
-    <package name="gcc41-32bit"/>
-    <package name="gcc41-ada"/>
-    <package name="gcc41-c++"/>
-    <package name="gcc41-fortran"/>
-    <package name="gcc41-fortran-32bit"/>
-    <package name="gcc41-gij"/>
-    <package name="gcc41-gij-32bit"/>
-    <package name="gcc41-info"/>
-    <package name="gcc41-java"/>
-    <package name="gcc41-locale"/>
-    <package name="gcc41-obj-c++"/>
-    <package name="gcc41-objc"/>
-    <package name="gcc41-objc-32bit"/>
-    <package name="gcc41-testresults"/>
-    <package name="gcc43"/>
-    <package name="gcc43-32bit"/>
-    <package name="gcc43-ada"/>
-    <package name="gcc43-c++"/>
-    <package name="gcc43-debugsource"/>
-    <package name="gcc43-fortran"/>
-    <package name="gcc43-fortran-32bit"/>
-    <package name="gcc43-gij"/>
-    <package name="gcc43-gij-32bit"/>
-    <package name="gcc43-info"/>
-    <package name="gcc43-java"/>
-    <package name="gcc43-locale"/>
-    <package name="gcc43-obj-c++"/>
-    <package name="gcc43-objc"/>
-    <package name="gcc43-objc-32bit"/>
-    <package name="gcc43-testresults"/>
-    <package name="gcc47"/>
-    <package name="gcc47-32bit"/>
-    <package name="gcc47-ada"/>
-    <package name="gcc47-ada-32bit"/>
-    <package name="gcc47-c++"/>
-    <package name="gcc47-debugsource"/>
-    <package name="gcc47-fortran"/>
-    <package name="gcc47-fortran-32bit"/>
-    <package name="gcc47-gij"/>
-    <package name="gcc47-gij-32bit"/>
-    <package name="gcc47-info"/>
-    <package name="gcc47-java"/>
-    <package name="gcc47-locale"/>
-    <package name="gcc47-obj-c++"/>
-    <package name="gcc47-objc"/>
-    <package name="gcc47-objc-32bit"/>
-    <package name="libada41"/>
-    <package name="libada43"/>
-    <package name="libada47"/>
-    <package name="libada47-32bit"/>
-    <package name="libffi4-gcc47"/>
-    <package name="libffi4-gcc47-32bit"/>
-    <package name="libffi41"/>
-    <package name="libffi41-32bit"/>
-    <package name="libffi41-devel"/>
-    <package name="libffi41-devel-32bit"/>
-    <package name="libffi43"/>
-    <package name="libffi43-32bit"/>
-    <package name="libffi43-debugsource"/>
-    <package name="libffi43-devel"/>
-    <package name="libffi43-devel-32bit"/>
-    <package name="libffi47"/>
-    <package name="libffi47-debugsource"/>
-    <package name="libffi47-devel"/>
-    <package name="libffi47-devel-32bit"/>
-    <package name="libgcc33"/>
-    <package name="libgcc33-32bit"/>
-    <package name="libgcc41"/>
-    <package name="libgcc41-32bit"/>
-    <package name="libgcc43"/>
-    <package name="libgcc43-32bit"/>
-    <package name="libgcc_s1-gcc47"/>
-    <package name="libgcc_s1-gcc47-32bit"/>
-    <package name="libgcj41"/>
-    <package name="libgcj41-32bit"/>
-    <package name="libgcj41-devel"/>
-    <package name="libgcj41-devel-32bit"/>
-    <package name="libgcj43"/>
-    <package name="libgcj43-32bit"/>
-    <package name="libgcj43-devel"/>
-    <package name="libgcj43-devel-32bit"/>
-    <package name="libgcj43-jar"/>
-    <package name="libgcj47"/>
-    <package name="libgcj47-32bit"/>
-    <package name="libgcj47-debugsource"/>
-    <package name="libgcj47-devel"/>
-    <package name="libgcj47-devel-32bit"/>
-    <package name="libgcj47-jar"/>
-    <package name="libgcj_bc1-gcc47"/>
-    <package name="libgcj_bc43"/>
-    <package name="libgfortran3-gcc47"/>
-    <package name="libgfortran3-gcc47-32bit"/>
-    <package name="libgfortran41"/>
-    <package name="libgfortran41-32bit"/>
-    <package name="libgfortran43"/>
-    <package name="libgfortran43-32bit"/>
-    <package name="libgomp1-gcc47"/>
-    <package name="libgomp1-gcc47-32bit"/>
-    <package name="libgomp43"/>
-    <package name="libgomp43-32bit"/>
-    <package name="libmudflap41"/>
-    <package name="libmudflap41-32bit"/>
-    <package name="libobjc4-gcc47"/>
-    <package name="libobjc4-gcc47-32bit"/>
-    <package name="libobjc41"/>
-    <package name="libobjc41-32bit"/>
-    <package name="libobjc43"/>
-    <package name="libobjc43-32bit"/>
-    <package name="libquadmath0-gcc47"/>
-    <package name="libquadmath0-gcc47-32bit"/>
-    <package name="libstdc++41"/>
-    <package name="libstdc++41-32bit"/>
-    <package name="libstdc++41-devel"/>
-    <package name="libstdc++41-devel-32bit"/>
-    <package name="libstdc++41-doc"/>
-    <package name="libstdc++43"/>
-    <package name="libstdc++43-32bit"/>
-    <package name="libstdc++43-devel"/>
-    <package name="libstdc++43-devel-32bit"/>
-    <package name="libstdc++43-doc"/>
-    <package name="libstdc++47-devel"/>
-    <package name="libstdc++47-devel-32bit"/>
-    <package name="libstdc++47-doc"/>
-    <package name="libstdc++6-gcc47"/>
-    <package name="libstdc++6-gcc47-32bit"/>
-    <package name="libstdc++6-gcc47-locale"/>
 
-    <package name="cpp45"/>
-    <package name="gcc45-32bit"/>
-    <package name="gcc45-ada"/>
-    <package name="gcc45-ada-32bit"/>
-    <package name="gcc45-c++"/>
-    <package name="gcc45-fortran-32bit"/>
-    <package name="gcc45-fortran"/>
-    <package name="gcc45-gij-32bit"/>
-    <package name="gcc45-gij"/>
-    <package name="gcc45-info"/>
-    <package name="gcc45-java"/>
-    <package name="gcc45-locale"/>
-    <package name="gcc45-objc-32bit"/>
-    <package name="gcc45-obj-c++"/>
-    <package name="gcc45-objc"/>
-    <package name="gcc45"/>
-    <package name="gcc45-testresults"/>
-    <package name="libada45"/>
-    <package name="libffi45-32bit"/>
-    <package name="libffi45-devel-32bit"/>
-    <package name="libffi45-devel"/>
-    <package name="libffi45"/>
-    <package name="libgcj_bc45"/>
-    <package name="libgcj45-32bit"/>
-    <package name="libgcj45-devel-32bit"/>
-    <package name="libgcj45-devel"/>
-    <package name="libgcj45"/>
-    <package name="libgfortran45-32bit"/>
-    <package name="libgfortran45"/>
-    <package name="libmudflap45-32bit"/>
-    <package name="libmudflap45"/>
-    <package name="libobjc45-32bit"/>
-    <package name="libobjc45"/>
-    <package name="libstdc++45"/>
-    <package name="libgcj45-jar"/>
-    <package name="libstdc++45-devel-32bit"/>
-    <package name="libstdc++45-devel"/>
-    <package name="libstdc++45-doc"/>
-    <package name="libgcc45"/>
-    <package name="libgcc45-32bit"/>
-    <package name="libstdc++45-32bit"/>
-    <package name="libgomp45"/>
-    <package name="libgomp45-32bit"/>
-
-    <package name="cpp46"/>
-    <package name="gcc46-32bit"/>
-    <package name="gcc46-ada"/>
-    <package name="gcc46-ada-32bit"/>
-    <package name="gcc46-c++"/>
-    <package name="gcc46-fortran-32bit"/>
-    <package name="gcc46-fortran"/>
-    <package name="gcc46-gij-32bit"/>
-    <package name="gcc46-gij"/>
-    <package name="gcc46-info"/>
-    <package name="gcc46-java"/>
-    <package name="gcc46-locale"/>
-    <package name="gcc46-objc-32bit"/>
-    <package name="gcc46-obj-c++"/>
-    <package name="gcc46-objc"/>
-    <package name="gcc46"/>
-    <package name="gcc46-testresults"/>
-    <package name="libada46"/>
-    <package name="libffi46-32bit"/>
-    <package name="libffi46-devel-32bit"/>
-    <package name="libffi46-devel"/>
-    <package name="libffi46"/>
-    <package name="libgcj_bc46"/>
-    <package name="libgcj46-32bit"/>
-    <package name="libgcj46-devel-32bit"/>
-    <package name="libgcj46-devel"/>
-    <package name="libgcj46"/>
-    <package name="libgfortran46-32bit"/>
-    <package name="libgfortran46"/>
-    <package name="libmudflap46-32bit"/>
-    <package name="libmudflap46"/>
-    <package name="libobjc46-32bit"/>
-    <package name="libobjc46"/>
-    <package name="libstdc++46"/>
-    <package name="libgcj46-jar"/>
-    <package name="libstdc++46-devel-32bit"/>
-    <package name="libstdc++46-devel"/>
-    <package name="libstdc++46-doc"/>
-    <package name="libgcc46"/>
-    <package name="libgcc46-32bit"/>
-    <package name="libstdc++46-32bit"/>
-    <package name="libgomp46"/>
-    <package name="libgomp46-32bit"/>
     <package name="gnome-panel-branding-SLED"/>
     <package name="gtk3-branding-SLED"/>
     <package name="yast2-wagon-control-SLE"/>
@@ -351,16 +102,6 @@
     <package name="gettext-runtime-mini"/>
     <package name="gettext-tools-mini"/>
 
-    <!-- systemd-mini packages, not installable -->
-    <package name="libsystemd0-mini"/>
-    <package name="libudev-mini-devel"/>
-    <package name="libudev-mini1"/>
-    <package name="systemd-mini"/>
-    <package name="systemd-mini-analyze"/>
-    <package name="systemd-mini-bash-completion"/>
-    <package name="systemd-mini-devel"/>
-    <package name="systemd-mini-sysvinit"/>
-
     <!-- Block Java bootstrap packages - boo#1019090 -->
     <package name="java-cup-bootstrap"/>
     <package name="java-1_7_0-bootstrap"/>
@@ -414,12 +155,6 @@
     <package name="bootsplash-branding-SLES"/>
     <package name="ghostscript-mini"/>
     <package name="ghostscript-mini-devel"/>
-    <package name="libcdio++0-mini"/>
-    <package name="libcdio-mini-devel"/>
-    <package name="libcdio-mini-utils"/>
-    <package name="libcdio_cdda0-mini"/>
-    <package name="libcdio_paranoia0-mini"/>
-    <package name="libudf0-mini"/>
     <package name="yast2-branding-SLED"/>
     <package name="yast2-branding-SLES"/>
     <package name="yast2-slide-show-SLED"/>
@@ -431,6 +166,5 @@
     <package name="yast2-trans-my"/>
     <package name="yast2-trans-tk"/>
 
-    <package name="sysvinit"/>
   </packagelist>
 </group>
diff --git a/groups.yml b/groups.yml
index 0a35735..c536733 100644
--- a/groups.yml
+++ b/groups.yml
@@ -111,92 +111,26 @@ dvd:
   - patterns-yast-yast2_basis: [required,suggested]
   - patterns-yast-yast2_install_wf: [required,suggested]
   - patterns-yast-yast2_server: [required,suggested]
-  - arabic-fonts
-  - arphic-uming-fonts
-  - cracklib-dict-full
   # gedit is tested as part of staging
   - gedit
-  - indic-fonts
-  - ipa-gothic-fonts
-  - khmeros-fonts
-  - lklug-fonts
   # for now xen_server
-  - thai-fonts
-  - un-fonts
-  - yast2-trans-af
-  - yast2-trans-ar
-  - yast2-trans-bg
-  - yast2-trans-bn
-  - yast2-trans-bs
-  - yast2-trans-ca
-  - yast2-trans-cs
-  - yast2-trans-cy
-  - yast2-trans-da
-  - yast2-trans-de
-  - yast2-trans-el
-  - yast2-trans-en_GB
-  - yast2-trans-es
-  - yast2-trans-et
-  - yast2-trans-fa
-  - yast2-trans-fi
-  - yast2-trans-fr
-  - yast2-trans-gl
-  - yast2-trans-gu
-  - yast2-trans-hi
-  - yast2-trans-hr
-  - yast2-trans-hu
-  - yast2-trans-id
-  - yast2-trans-it
-  - yast2-trans-ja
-  - yast2-trans-jv
-  - yast2-trans-ka
-  - yast2-trans-km
-  - yast2-trans-ko
-  - yast2-trans-lo
-  - yast2-trans-lt
-  - yast2-trans-mk
-  - yast2-trans-mr
-  - yast2-trans-nb
-  - yast2-trans-nl
-  - yast2-trans-pa
-  - yast2-trans-pl
-  - yast2-trans-pt
-  - yast2-trans-pt_BR
-  - yast2-trans-ro
-  - yast2-trans-ru
-  - yast2-trans-si
-  - yast2-trans-sk
-  - yast2-trans-sr
-  - yast2-trans-sv
-  - yast2-trans-tr
-  - yast2-trans-uk
-  - yast2-trans-vi
-  - yast2-trans-wa
-  - yast2-trans-xh
-  - yast2-trans-zh_CN
-  - yast2-trans-zh_TW
-  - yast2-trans-zu
   - patterns-server-kvm_server
   - patterns-server-kvm_tools
   - patterns-base-minimal_base: [required,suggested]
   - patterns-yast-x11_yast: [required,suggested]
   - patterns-server-xen_server: [x86_64]
   # bnc#431280 (Japanese fonts)
-  - arphic-uming-fonts
-  - cellwriter
   - clicfs
   - createrepo_c
-  - git
   # kdump+tools
   - kdump
   # all kernel flavors we want to have
   - kernel-default
   - kexec-tools
   - quota-nfs
-  - nvme-cli
   - wicked
 
-  - patterns-media-rest_dvd
+  - patterns-media-rest_dvd: [required]
   # all loggers
   - rsyslog
   - syslog-service
@@ -400,8 +334,6 @@ dvd:
   - technisat-usb2-firmware
   - virtualbox-guest-tools: [x86_64]
   - xen-tools-domU
-  # used in staging tests
-  - yast2-nfs-server
   - bind
   - Mesa-demo-x
   - inkscape
diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in
index c0de360..3489cd3 100644
--- a/openSUSE-release.spec.in
+++ b/openSUSE-release.spec.in
@@ -178,6 +178,9 @@ Provides:       weakremover(libxtables11)
 Provides:       weakremover(libzip4)
 Provides:       weakremover(mt_st)
 Provides:       weakremover(openssl-debuginfo)
+# Suggest openSUSE-release-ftp as 'main flavor'. Offline install from DVD only
+# has openSSE=release-DVD available, which is good for the use case (boo#1209959)
+Suggests:       openSUSE-release-ftp
 %include %{SOURCE100}
 ___PRODUCT_PROVIDES___