DVD5.x86_64 is aligned

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000product?expand=0&rev=820

dvd.group

@@ -2691,7 +2691,6 @@
     <package name="libqt5-qtpaths" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libqt5-qtquickcontrols" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libqt5-qtquickcontrols2" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="libqt5-qtstyleplugins-platformtheme-gtk2" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libqt5-qttranslations" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libqt5-qtvirtualkeyboard" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libqt5-qtvirtualkeyboard-hunspell" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -2829,7 +2828,6 @@
     <package name="libstdc++6" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="libstdc++6-devel-gcc8" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libstdc++6-gcc7-locale" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="libstdc++6-locale" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="libstoken1" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libstorage-ng-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="libstorage-ng-ruby" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -3128,7 +3126,6 @@
     <package name="lsof" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="lsscsi" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="ltrace" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="lttng-modules" supportstatus="unsupported"/> <!-- reason: dvd:lttng-modules -->
     <package name="lua53" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="lua53-luasocket" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="luit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -3369,9 +3366,9 @@
     <package name="open-vm-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="open-vm-tools-desktop" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="openSUSE-build-key" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="openSUSE-release" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="openSUSE-release-dvd" supportstatus="unsupported"/> <!-- reason: dvd:kernel-default -->
     <package name="openSUSE-xfce-icon-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="openafs" supportstatus="unsupported"/> <!-- reason: dvd:openafs -->
     <package name="openal-soft" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="openbox" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="openbox-adwaita-ob-theme" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -4903,7 +4900,7 @@
     <package name="valgrind" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="vdr" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="vdr-lang" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
-    <package name="vhba-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:vhba-kmp-default -->
+    <package name="vhba-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="viewnior" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="viewnior-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="viewres" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -4916,12 +4913,9 @@
     <package name="vinagre-lang" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="virt-install" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="virt-manager-common" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="virtualbox" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="virtualbox-guest-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="virtualbox-guest-tools" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="virtualbox-guest-x11" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="virtualbox-host-kmp-default" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name="virtualbox-qt" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="vlan" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="vlc" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="vlc-codec-gstreamer" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5173,6 +5167,8 @@
     <package name="xman" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="xmanja" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="xmessage" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
+    <package name="xml-commons-apis" supportstatus="unsupported"/> <!-- reason: dvd:xml-commons-apis -->
+    <package name="xml-commons-resolver" supportstatus="unsupported"/> <!-- reason: dvd:xml-commons-resolver -->
     <package name="xmlbeans" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="xmlcharent" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="xmlformat" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
@@ -5404,7 +5400,7 @@
   <conditional name="only_i586"/>
   <packagelist relationship="recommends">
     <package name="libpng12-0" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name=" openafs-client uninstallable: nothing provides kernel-uname-r = 4.19.12-1-default needed by openafs-kmp-default-1.8.2_k4.19.12_1-2.14.i586" supportstatus="unsupported"/>
+    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 4.19.12-1-default needed by openafs-kmp-default-1.8.2_k4.19.12_1-2.14.i586-->
   </packagelist>
 </group>
 <group name="dvd.x86_64">
@@ -5614,7 +5610,7 @@
     <package name="nss_ldap-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="numactl" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="numad" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
-    <package name=" openafs-client uninstallable: nothing provides kernel-uname-r = 4.19.12-1-default needed by openafs-kmp-default-1.8.2_k4.19.12_1-2.14.x86_64" supportstatus="unsupported"/>
+    <!-- openafs-client uninstallable: nothing provides kernel-uname-r = 4.19.12-1-default needed by openafs-kmp-default-1.8.2_k4.19.12_1-2.14.x86_64-->
     <package name="opie-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->
     <package name="pam-32bit" supportstatus="unsupported"/> <!-- reason: dvd:patterns-media-rest_dvd -->
     <package name="pam_apparmor-32bit" supportstatus="unsupported"/> <!-- reason: dvd:expansion -->

openSUSE.product

@@ -12,15 +12,16 @@
       <!-- Ensure we have valid distrotarget - used by "zypper tos" - boo#977052 -->
       <register>
         <updates>
-            <distrotarget arch="x86_64" >openSUSE-Tumbleweed-x86_64</distrotarget>
+          <distrotarget arch="x86_64">openSUSE-Tumbleweed-x86_64</distrotarget>
-            <distrotarget arch="s390x"  >openSUSE-Tumbleweed-s390x</distrotarget>
+          <distrotarget arch="s390x">openSUSE-Tumbleweed-s390x</distrotarget>
           <distrotarget arch="ppc64le">openSUSE-Tumbleweed-ppc64le</distrotarget>
           <distrotarget arch="aarch64">openSUSE-Tumbleweed-aarch64</distrotarget>
         </updates>
       </register>
 
       <updaterepokey>000000000</updaterepokey>
-        <summary>openSUSE Tumbleweed</summary> <!-- one line only -->
+      <summary>openSUSE Tumbleweed</summary>
+      <!-- one line only -->
       <shortsummary>openSUSE</shortsummary>
 
       <description>openSUSE Tumbleweed is the rolling distribution by the openSUSE.org project.
@@ -31,22 +32,19 @@
         <language>cs</language>
         <language>da</language>
         <language>de</language>
+        <language>el</language>
         <language>en</language>
         <language>en_GB</language>
         <language>en_US</language>
         <language>es</language>
-			<language>fi</language>
         <language>fr</language>
         <language>hu</language>
         <language>it</language>
         <language>ja</language>
-			<language>nb</language>
-			<language>nl</language>
         <language>pl</language>
         <language>pt</language>
         <language>pt_BR</language>
         <language>ru</language>
-			<language>sv</language>
         <language>zh</language>
         <language>zh_CN</language>
         <language>zh_TW</language>
@@ -54,8 +52,7 @@
 
       <urls>
         <url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url>
-            <!-- <url name="smolt">http://smolt.opensuse.org/register.pl</url>
+        <!-- <url name="smolt">http://smolt.opensuse.org/register.pl</url> <url name="register">http://register.novell.com/</url> -->
-                 <url name="register">http://register.novell.com/</url> -->
         <url name="repository">http://download.opensuse.org/tumbleweed/repo/oss/</url>
         <!-- url name="update">http://download.opensuse.org/update/factory/</url> -->
       </urls>
@@ -72,7 +69,6 @@
         <!-- needed for current content file -->
         <releasepackage name="openSUSE-release" flag="EQ" version="%{version}"/>
         <distribution>openSUSE</distribution>
-            <xi:include href="obsoletepackages.inc" />
       </installconfig>
 
       <runtimeconfig>
@@ -82,169 +78,122 @@
     </product>
   </products>
 
-    <xi:include href="defaults-conditionals.include" />
+  <xi:include href="defaults-conditionals.include"/>
 
   <repositories>
     <repository path="obs://openSUSE:Factory/standard"/>
     <repository path="obs://openSUSE:Factory:Live/standard"/>
   </repositories>
 
-    <xi:include href="defaults-archsets.include" />
+  <xi:include href="defaults-archsets.include"/>
 
   <mediasets>
     <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
-        <media type="ftp"
+    <media type="ftp" flavor="ftp" sourcemedia="3" debugmedia="2" mediastyle="suse-tumbleweed"
-               flavor="ftp"
+           create_pattern="false" repo_only="true" run_make_listings="true"
-               sourcemedia="3" 
+           use_required="true" use_recommended="true" use_suggested="false" use_undecided="true">
-               debugmedia="2" 
-               mediastyle="suse-tumbleweed"
-               create_pattern="false" 
-	       repo_only="true"
-	       run_make_listings="true"
-               use_required="true" 
-               use_recommended="true" 
-               use_suggested="false"
-               use_undecided="true">
 
-          <archsets>                 <!-- for this we generate a medium  --> 
+      <archsets>
-            <archset ref="i586" />   <!-- for this we generate a product file -->
+        <!-- for this we generate a medium -->
-            <archset ref="x86_64" /> <!-- so we get 2 product files on this medium -->
+        <archset ref="i586"/>
+        <!-- for this we generate a product file -->
+        <archset ref="x86_64"/>
+        <!-- so we get 2 product files on this medium -->
       </archsets>
       <!-- we put all packages (even suggested) on the media for the two groups below -->
       <metadata>
         <!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
-              <package name="skelcd-installer-openSUSE" />
+        <package name="skelcd-installer-openSUSE"/>
-              <package name="instlux" />
+        <package name="instlux"/>
-              <package name="skelcd-control-openSUSE" />
+        <package name="skelcd-control-openSUSE"/>
         <package name="skelcd-openSUSE"/>
         <!-- package name="yast2-slide-show" / -->
       </metadata>
+      <use group="NON_FTP_PACKAGES" create_pattern="false"/>
       <use group="i586_additional" create_pattern="false" />
       <use group="i686_packages" create_pattern="false" />
       <use group="i686_kernels_ftp" create_pattern="false" />
-          <use group="NON_FTP_PACKAGES" create_pattern="false" />
       <use group="kernel_pae_special" create_pattern="false" />
     </media>
 
     <!-- BEWARE: do not touch the naming here without adapting ftp upload scripts ! -->
-        <media type="cd" 
+    <media type="cd" flavor="mini" name="openSUSE-Tumbleweed-NET" run_hybridiso="true"
-               flavor="mini"
+           mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
-               name="openSUSE-Tumbleweed-NET"
+           use_required="true" use_recommended="true" use_suggested="false">
-               run_hybridiso="true"
-               mediastyle="suse-tumbleweed"
-               sourcemedia="0" 
-               firmware="uefi"
-               use_required="true" 
-               use_recommended="true" 
-               use_suggested="false">
       <archsets>
-            <archset ref="x86_64" />
+        <archset ref="x86_64"/>
       </archsets>
       <archsets>
-            <archset ref="i586" />
+        <archset ref="i586"/>
       </archsets>
       <metadata>
-		  <package name="skelcd-installer-net-openSUSE" />
+        <package name="skelcd-installer-net-openSUSE"/>
         <package name="skelcd-openSUSE"/>
       </metadata>
     </media>
 
-        <media type="dvd5" 
+    <media type="dvd5" flavor="dvd" name="openSUSE-Tumbleweed-DVD" run_hybridiso="true"
-               flavor="dvd"
+           mediastyle="suse-tumbleweed" sourcemedia="0" firmware="uefi"
-               name="openSUSE-Tumbleweed-DVD" 
+           run_media_check="true" use_required="true" use_recommended="true" use_suggested="false">
-               sourcemedia="0" 
-               mediastyle="suse-tumbleweed"
-               firmware="uefi"
-               run_media_check="true"
-               run_hybridiso="true"
-               use_required="true" 
-               use_recommended="true" 
-               use_suggested="false">
 
-          <use group="DVD-i586" create_pattern="false" />
+      <use group="dvd" create_pattern="false"/>
-          <use group="i586_additional" create_pattern="false" />
+      <use group="dvd.i586" create_pattern="false"/>
-          <use group="kernel_pae_special" create_pattern="false" />
+      <use group="dvd.x86_64" create_pattern="false"/>
 
-          <use group="DVD-x86_64" create_pattern="false" />
+      <archsets>
-
+        <!-- for this we generate a medium -->
-          <archsets>                 <!-- for this we generate a medium -->
+        <archset ref="i586"/>
-            <archset ref="i586" />
       </archsets>
       <archsets>
-            <archset ref="x86_64" />
+        <archset ref="x86_64"/>
       </archsets>
 
       <metadata>
         <!-- if you like to add a metapackage to the real media, add it in a normal group.xml file -->
-              <package name="skelcd-installer-openSUSE" />
+        <package name="skelcd-installer-openSUSE"/>
-              <package name="skelcd-control-openSUSE" />
+        <package name="skelcd-control-openSUSE"/>
-              <package name="skelcd-openSUSE" />
+        <package name="skelcd-openSUSE"/>
         <!--package name="yast2-slide-show" /-->
       </metadata>
     </media>
 
-        <media type="cd"
+    <media type="cd" flavor="livecd-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-kde">
-               flavor="livecd-kde"
-               mediastyle="suse-tumbleweed"
-               name="openSUSE-Tumbleweed-livecd-kde" >
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-        <media type="cd"
+    <media type="cd" flavor="livecd-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-x11">
-               flavor="livecd-x11"
-               mediastyle="suse-tumbleweed"
-               name="openSUSE-Tumbleweed-livecd-x11" >
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-        <media type="cd"
+    <media type="cd" flavor="livecd-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-livecd-gnome">
-               flavor="livecd-gnome" 
-               mediastyle="suse-tumbleweed"
-               name="openSUSE-Tumbleweed-livecd-gnome" >
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-        <media type="cd"
+    <media type="cd" flavor="usb-kde" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-kde">
-               flavor="usb-kde"
-               mediastyle="suse-tumbleweed"
-               name="openSUSE-Tumbleweed-usb-kde" >
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-        <media type="cd"
+    <media type="cd" flavor="usb-gnome" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-gnome">
-               flavor="usb-gnome" 
-               mediastyle="suse-tumbleweed"
-               name="openSUSE-Tumbleweed-usb-gnome" >
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
-        <media type="cd"
+    <media type="cd" flavor="usb-x11" mediastyle="suse-tumbleweed" name="openSUSE-Tumbleweed-usb-x11">
-               flavor="usb-x11"
-               mediastyle="suse-tumbleweed"
-               name="openSUSE-Tumbleweed-usb-x11" >
       <!-- Create no product media, but a flavor release subpackage -->
     </media>
 
   </mediasets>
 
   <xi:include href="NON_FTP_PACKAGES.group"/>
-    <xi:include href="DVD5-i586.group" />
+  <xi:include href="dvd.group"/>
-    <xi:include href="DVD5-x86_64.group" />
   <xi:include href="i686_list.group" />
   <xi:include href="i686_kernel_ftp.group" />
 
-    <group name="drop_from_dvd9">
-      <conditional name="drop_from_medium" />
-        <packagelist>
-	   <package name="openSUSE-release-dvd"/> 
-        </packagelist>
-    </group>
   <group name="kernel_pae_special">
-      <conditional name="only_i686" />
+    <conditional name="only_i686"/>
     <packagelist relationship="requires">
-        <package name="kernel-pae-base" />
+      <package name="kernel-pae-base"/>
-        <package name="kernel-pae-devel" />
+      <package name="kernel-pae-devel"/>
-        <package name="kernel-pae" />
+      <package name="kernel-pae"/>
     </packagelist>
   </group>
 

unsorted.yml

@@ -9961,6 +9961,7 @@ unsorted:
   - libqt5-qtspeech-examples 
   - libqt5-qtstyleplugins 
   - libqt5-qtstyleplugins-devel 
+  - libqt5-qtstyleplugins-platformtheme-gtk2 
   - libqt5-qtsvg-devel 
   - libqt5-qtsvg-devel-32bit: [x86_64] 
   - libqt5-qtsvg-examples 
@@ -10568,6 +10569,7 @@ unsorted:
   - libstdc++6-devel-gcc8-32bit: [x86_64] 
   - libstdc++6-gcc7 
   - libstdc++6-gcc7-32bit: [x86_64] 
+  - libstdc++6-locale 
   - libstfl-devel 
   - libstfl0 
   - libstilview-devel 
@@ -11642,6 +11644,7 @@ unsorted:
   - lswm 
   - lsyncd 
   - ltrace-32bit: [x86_64] 
+  - lttng-modules 
   - lttng-modules-kmp-default 
   - lttng-modules-kmp-pae: [i586] 
   - lttng-tools 
@@ -13506,6 +13509,7 @@ unsorted:
   - openSUSE-release-usb-gnome 
   - openSUSE-release-usb-kde 
   - openSUSE-release-usb-x11 
+  - openafs 
   - openafs-authlibs 
   - openafs-authlibs-devel 
   - openafs-client 
@@ -29821,10 +29825,13 @@ unsorted:
   - virt-v2v: [x86_64] 
   - virt-viewer 
   - virt-what 
+  - virtualbox 
   - virtualbox-devel 
   - virtualbox-guest-desktop-icons 
   - virtualbox-guest-source 
+  - virtualbox-host-kmp-default 
   - virtualbox-host-source 
+  - virtualbox-qt 
   - virtualbox-vnc 
   - virtualbox-websrv 
   - viruskiller 
@@ -30228,11 +30235,9 @@ unsorted:
   - xmgrace-devel 
   - xmh 
   - xmined 
-  - xml-commons-apis 
   - xml-commons-apis-bootstrap 
   - xml-commons-apis-javadoc 
   - xml-commons-apis-manual 
-  - xml-commons-resolver 
   - xml-commons-resolver-bootstrap 
   - xml-commons-resolver-javadoc 
   - xml-commons-which-bootstrap