9 files changed, 71 insertions, 22 deletions
diff --git a/config/build.cfg b/config/build.cfg
index f299f04..c6bd648 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -22,7 +22,8 @@ my $arch2 = $arch eq 'i586' ? 'i386' : $arch;
 my $_c = {
     repo => {
         classes => [ qw(core nonfree) ],
-        types   => [ qw(release updates) ],
+#        types   => [ qw(release updates) ],
+        types   => [ qw(release) ],
     },
     media_cfg => {
         askmedia => 1,
@@ -32,20 +33,21 @@ my $_c = {
         'config/pkg-groups.lst',
     ],
     group_exclude_lists => [
-       'config/rpmsrate-tofix.lst',
+        'config/rpmsrate-to-fix.lst',
     ],
     package_include_lists => [
         'config/pkg-core.lst',
         if_($arch ne 'x86_64', 'config/pkg-core-32.lst'),
         if_($arch eq 'x86_64', 'config/pkg-core-64.lst'),
+        'config/pkg-to-review.lst',
         'config/pkg-nonfree.lst',
     ],
     package_exclude_lists => [
         'config/pkg-exclude.lst',
-        'config/pkg-exclude-tofix.lst',
+        'config/pkg-exclude-to-fix.lst',
     ],
     known_conflicts =>
-        'config/known_conflicts.lst',
+        'config/known-conflicts.lst',
     copy_from_repo => [
         'autorun.inf'               => 'files/autorun.inf',
         'dosutils'                  => 'files/dosutils',
diff --git a/config/known_conflicts.lst b/config/known-conflicts.lst
index 86bd071..afedcef 100644
--- a/config/known_conflicts.lst
+++ b/config/known-conflicts.lst
@@ -1,4 +1,5 @@
 # These are expected
 broadcom-bcma-config
 broadcom-ssb-config
+grub2-efi # shouldn't be needed in mga7
 guile1.8
diff --git a/config/pkg-core-64.lst b/config/pkg-core-64.lst
index 83c0007..cfc9e8b 100644
--- a/config/pkg-core-64.lst
+++ b/config/pkg-core-64.lst
@@ -1,3 +1,5 @@
 lib64SDL_net1.2_0 
+lib64cares2
 lib64ossp_uuid-devel
 lib64unimrcp-deps
+lib64webkit-gir1.0
diff --git a/config/pkg-core.lst b/config/pkg-core.lst
index 3880402..9a49e26 100644
--- a/config/pkg-core.lst
+++ b/config/pkg-core.lst
@@ -59,18 +59,12 @@ gnome-disk-utility
 gnome-screenshot
 gnome-terminal-nautilus
 grub2
+grub2-efi
 grub2-mageia-theme
 guile1.8
+gvolwheel
 icewm
 kipi-plugins-
-lib64cares2
-#lib64gtk+-x11-2.0_0
-#lib64lightdm-gobject1_0
-#lib64mozjs185_1.0
-#lib64ossp_uuid-devel
-#lib64SDL_net1.2_0
-#lib64unimrcp-deps
-#lib64webkit-gir1.0
 libreoffice-kde4
 mageiawelcome
 marble
@@ -90,6 +84,7 @@ os-prober
 pacemaker
 perl-Test-Mock-LWP
 phonon
+phonon-gstreamer
 pidgin
 python-at-spi
 quassel
diff --git a/config/pkg-exclude-tofix.lst b/config/pkg-exclude-to-fix.lst
index 7f765f1..7f765f1 100644
--- a/config/pkg-exclude-tofix.lst
+++ b/config/pkg-exclude-to-fix.lst
diff --git a/config/pkg-nonfree.lst b/config/pkg-nonfree.lst
index e383ff0..bd48113 100644
--- a/config/pkg-nonfree.lst
+++ b/config/pkg-nonfree.lst
@@ -2,7 +2,9 @@ bluez-firmware
 dkms-nvidia304
 dkms-nvidia340
 dkms-nvidia-current
+kernel-firmware-nonfree
 microcode
+# the nvidia304 packages have a dependency on a 32-bit library
 #nvidia304-cuda-opencl
 #nvidia304-devel
 nvidia304-doc-html
diff --git a/config/pkg-to-review.lst b/config/pkg-to-review.lst
new file mode 100644
index 0000000..8cc667d
--- /dev/null
+++ b/config/pkg-to-review.lst
@@ -0,0 +1,48 @@
+# This file lists packages that were on the Mageia-6 ISOs, but that aren't
+# automatically included by drakclassic. Mostly this is because the package
+# requiring them specifies alternatives, and drakclassic picks a different
+# alternative.
+
+# Various alternative fonts
+bitmap-fangsongti-fonts
+fonts-ttf-chinese-opendesktop
+fonts-ttf-japanese
+fonts-ttf-japanese-extra
+fonts-ttf-kanjistrokeorders
+fonts-ttf-wqy-microhei
+google-noto-sans-bengali-
+google-noto-sans-cjk-
+google-noto-sans-devanagari-
+google-noto-sans-gujarati-
+google-noto-sans-gurmukhi-
+google-noto-sans-japanese-
+google-noto-sans-korean-
+google-noto-sans-malayalam-
+google-noto-sans-oriya-
+google-noto-sans-simplified-chinese-
+google-noto-sans-sinhala-
+google-noto-sans-tamil-
+google-noto-sans-traditional-chinese-
+lklug-fonts-0.6
+openimageio
+sazanami-gothic-fonts
+sazanami-mincho-fonts
+x11-font-misc
+
+# This is an alternative for webfetch
+aria2
+
+# This is an alternative for pulseaudio-volume-control
+pavucontrol-qt
+
+# These are all alternatives for sendmail-command.
+ssmtp sendmail dma msmtp
+
+# The automatic expansion of locales in rpmsrate appears not to include all
+# the available locales.
+hunspell-
+kde-l10n-bs
+# Need to fix the conflict on this one
+#kde-l10n-ca-valencia
+kde-l10n-ia
+
diff --git a/config/rpmsrate-to-fix.lst b/config/rpmsrate-to-fix.lst
new file mode 100644
index 0000000..0ce7fed
--- /dev/null
+++ b/config/rpmsrate-to-fix.lst
@@ -0,0 +1,9 @@
+# This needs to be qualified by !TYPE"64bit".
+kernel-desktop586-latest
+
+# These packages don't exist in the repository.
+kmediafactory
+linuxconsole # should this be linuxconsoletools?
+pinentry-qt4 # should this be pinentry-qt5?
+pluma-plugins
+python-rpm
diff --git a/config/rpmsrate-tofix.lst b/config/rpmsrate-tofix.lst
deleted file mode 100644
index 743d464..0000000
--- a/config/rpmsrate-tofix.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-python-rpm
-linuxconsole
-kmediafactory
-pinentry-qt4
-pluma-plugins
-kernel-desktop586-latest
-#wine
-#lsb-lib
-#libmariadb-devel
-#libalsa-plugins