From 0aba979a3ac59e1b8619d8f3b271d2daae0731d9 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Apr 24 2020 19:17:52 +0000
Subject: Setup for F32 cloud and container composes


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/fedora-cloud.conf b/fedora-cloud.conf
index cb44721..524dd3e 100644
--- a/fedora-cloud.conf
+++ b/fedora-cloud.conf
@@ -14,7 +14,7 @@ comps_file = {
     'command': 'make comps-f32.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['429476B4'] # None = unsigned
+sigkeys = ['12C944D0'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
@@ -107,7 +107,7 @@ filter_packages = [
         'generic*',
         'GConf2-dbus*',
         'bluez-gnome',
-        'java-1.8.0-openjdk',
+        'java-11-openjdk',
         'community-mysql*',
         'jruby*',
         'gimp-help-*',
@@ -118,7 +118,7 @@ filter_packages = [
 multilib_blacklist = {
     '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
         'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'php-devel', 'java-*',
+        'php-devel', 'java-*', 'bash-devel',
         'httpd-devel', 'tomcat-native', 'php*', 'httpd',
         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
     ],
@@ -131,7 +131,10 @@ multilib_whitelist = {
         'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
         'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
         'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
-        'mariadb-connector-odbc', 'compiler-rt'
+        'mariadb-connector-odbc', 'compiler-rt',
+        'nvidia-query-resource-opengl-lib',	
+        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',	
+        'glib-networking'
     ],
 }
 
diff --git a/fedora-container.conf b/fedora-container.conf
index b1990d0..f762676 100644
--- a/fedora-container.conf
+++ b/fedora-container.conf
@@ -14,7 +14,7 @@ comps_file = {
     'command': 'make comps-f32.xml'
 }
 variants_file='variants-fedora.xml'
-sigkeys = ['429476B4'] # None = unsigned
+sigkeys = ['12C944D0'] # None = unsigned
 # limit tree architectures
 # if undefined, all architectures from variants.xml will be included
 tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
@@ -107,7 +107,7 @@ filter_packages = [
         'generic*',
         'GConf2-dbus*',
         'bluez-gnome',
-        'java-1.8.0-openjdk',
+        'java-11-openjdk',
         'community-mysql*',
         'jruby*',
         'gimp-help-*',
@@ -118,7 +118,7 @@ filter_packages = [
 multilib_blacklist = {
     '*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
         'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
-        'php-devel', 'java-*',
+        'php-devel', 'java-*', 'bash-devel',
         'httpd-devel', 'tomcat-native', 'php*', 'httpd',
         'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
     ],
@@ -131,7 +131,10 @@ multilib_whitelist = {
         'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
         'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
         'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
-        'mariadb-connector-odbc', 'compiler-rt'
+        'mariadb-connector-odbc', 'compiler-rt',
+        'nvidia-query-resource-opengl-lib',	
+        'ibus-libs', 'ibus-gtk2', 'ibus-gtk3',	
+        'glib-networking'
     ],
 }