From c7fcf5ddb038a5501c6412f44f343786140bca9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20P=C3=A1ral?= <kparal@redhat.com>
Date: Tue, 21 Jun 2022 14:28:06 +0200
Subject: [PATCH] bodhi multilib_*: sort package names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And put them on individual lines, this makes them easier to compare with
pungi-fedora upstream.

Signed-off-by: Kamil Páral <kparal@redhat.com>
---
 .../backend/templates/pungi.rpm.conf.j2       | 80 ++++++++++++++-----
 1 file changed, 60 insertions(+), 20 deletions(-)

diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
index 839b2ca106..01bbe8dcc3 100644
--- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
+++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
@@ -116,30 +116,70 @@ multilib = [
 filter_packages = []
 # format: {arch|*: [packages]}
 multilib_blacklist = {
-    '*': ['kernel*', 'kernel-PAE*', 'kernel*debug*',
-        'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel',
-        'php-devel', 'java-1.6.0-openjdk-devel',
-        'java-1.7.0-openjdk-devel', 'java-1.8.0-openjdk-devel',
-        'httpd-devel', 'tomcat-native', 'php*', 'httpd',
-        'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*',
-        'mp'
-    ],
+    '*': [
+        'dmraid-devel',
+        'ghc-*',
+        'httpd',
+        'httpd-devel',
+        'java-1.5.0-gcj-devel',
+        'java-1.6.0-openjdk-devel',
+        'java-1.7.0-icedtea-devel',
+        'java-1.7.0-openjdk-devel',
+        'java-1.8.0-openjdk-devel',
+        'kdeutils-devel',
+        'kernel*',
+        'kernel*debug*',
+        'kernel-PAE*',
+        'krb5-server',
+        'krb5-server-ldap',
+        'mkinitrd-devel',
+        'mod_*',
+        'mp',
+        'php*',
+        'php-devel',
+        'tomcat-native',
+        ],
 }
 # format: {arch|*: [packages]}
 multilib_whitelist = {
-    '*': ['libgnat', 'wine', 'wine-*', 'lmms-vst', 'nspluginwrapper',
-        'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
-        'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
-        'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
-        'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
-        'fakechroot-libs','mesa-vdpau-drivers', 'mesa-vulkan-drivers',
-        'p11-kit-trust', 'mariadb-connector-odbc', 'compiler-rt',
+    '*': [
+        '*-static',
+        'apitrace-libs',
+        'compiler-rt',
+        'dssi-vst-wine',
+        'fakechroot-libs',
+        'fakeroot-libs',
+        'glib-networking',
+        'glx-utils',
+        'ibus-gtk2',
+        'ibus-gtk3',
+        'ibus-libs',
+        'iptables',
+        'libflashsupport',
+        'libgnat',
+        'lmms-vst',
+        'mangohud',
+        'mariadb-connector-odbc',
+        'mesa-vdpau-drivers',
+        'mesa-vulkan-drivers',
+        'mysql-connector-odbc',
+        'nosync',
+        'nspluginwrapper',
         'nvidia-query-resource-opengl-lib',
-        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',
-        'glib-networking', 'dssi-vst-wine', 'mangohud', 'vkBasalt', 'glx-utils',
-        'pipewire', 'iptables'
-    ],
+        'p11-kit-trust',
+        'perl-libs',
+        'pipewire',
+        'postgresql-odbc',
+        'redhat-lsb',
+        'syslinux-extlinux-nonlinux',
+        'syslinux-nonlinux',
+        'syslinux-tftpboot',
+        'valgrind',
+        'vkBasalt',
+        'wine',
+        'wine-*',
+        'yaboot',
+        ],
 }
 createiso_skip = [
         ('^Everything$', {