12 files changed, 100 insertions, 55 deletions
diff --git a/config/build.cfg b/config/build.cfg
index c6bd648..478625b 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -30,21 +30,19 @@ my $_c = {
         suppl    => 1,
     },
     group_include_lists => [
-        'config/pkg-groups.lst',
+        'config/group-include.lst',
     ],
     group_exclude_lists => [
         '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',
+        'config/pkg-include-core.lst',
+        'config/pkg-include-nonfree.lst',
+        'config/pkg-include-to-review.lst',
     ],
     package_exclude_lists => [
         'config/pkg-exclude.lst',
-        'config/pkg-exclude-to-fix.lst',
+        'config/pkg-exclude-to-review.lst',
     ],
     known_conflicts =>
         'config/known-conflicts.lst',
diff --git a/config/pkg-groups.lst b/config/group-include.lst
index d77c41a..d77c41a 100644
--- a/config/pkg-groups.lst
+++ b/config/group-include.lst
diff --git a/config/known-conflicts.lst b/config/known-conflicts.lst
index afedcef..fabe510 100644
--- a/config/known-conflicts.lst
+++ b/config/known-conflicts.lst
@@ -3,3 +3,8 @@ broadcom-bcma-config
 broadcom-ssb-config
 grub2-efi # shouldn't be needed in mga7
 guile1.8
+pavucontrol-qt
+postfix
+
+i586:   libossp_uuid-devel
+x86_64: lib64ossp_uuid-devel
diff --git a/config/pkg-core-32.lst b/config/pkg-core-32.lst
deleted file mode 100644
index dff4366..0000000
--- a/config/pkg-core-32.lst
+++ /dev/null
@@ -1,23 +0,0 @@
-kernel-desktop586-latest
-kernel-desktop586-devel-latest
-vboxadditions-kernel-desktop586-latest
-virtualbox-kernel-desktop586-latest
-libmozjs185_1.0
-libdirectfb1.5_0
-libgtk+-x11-2.0_0
-libjscore-gir3.0
-libwebkit-gir1.0
-libcares2
-libuClibc0.9.30.3
-libdirectfb-devel
-libgnome-media-profiles0
-libSDL_net1.2_0
-libfonts
-libkmf0
-liblayout
-libossp_uuid-devel
-libmate-polkit1_0
-liblightdm-gobject1_0
-libglapi0
-libunimrcp-deps
-wine
diff --git a/config/pkg-core-64.lst b/config/pkg-core-64.lst
deleted file mode 100644
index cfc9e8b..0000000
--- a/config/pkg-core-64.lst
+++ /dev/null
@@ -1,5 +0,0 @@
-lib64SDL_net1.2_0 
-lib64cares2
-lib64ossp_uuid-devel
-lib64unimrcp-deps
-lib64webkit-gir1.0
diff --git a/config/pkg-exclude-to-fix.lst b/config/pkg-exclude-to-fix.lst
deleted file mode 100644
index 7f765f1..0000000
--- a/config/pkg-exclude-to-fix.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-2mandvd
-celestia
-#gcc3.3
-xfig
diff --git a/config/pkg-exclude-to-review.lst b/config/pkg-exclude-to-review.lst
new file mode 100644
index 0000000..8c0632a
--- /dev/null
+++ b/config/pkg-exclude-to-review.lst
@@ -0,0 +1,34 @@
+# This section was derived from the bcd 'exclude_tofix' list, removing any
+# obsolete entries.
+2mandvd
+celestia
+gcc3.3 # required by gettext-devel->devel(libtinfo)->devel(libgcc_s)
+xfig
+
+# The bcd 'input_cat' list included a large number of kipi plugins. We now
+# include all kipi plugins using a wildcard entry. These are the plugins
+# that weren't included before.
+kipi-plugins-dropbox
+kipi-plugins-googleservices
+kipi-plugins-imgurexport
+kipi-plugins-jalbum
+kipi-plugins-piwigo
+kipi-plugins-remotestorage
+
+# We now include all hunspell packages using a wildcard. This is the only one
+# that wasn't included before.
+hunspell-gsc
+
+# bcd does not match rpmsrate flags that are combined by the '|' operator.
+# drakclassic does.
+caja-image-converter
+dia
+eom
+libreoffice-emailmerge
+libreoffice-wiki-publisher
+pan
+php-manual-en
+tvtime
+
+lxqt-l10n
+
diff --git a/config/pkg-exclude.lst b/config/pkg-exclude.lst
index ece3878..b47c947 100644
--- a/config/pkg-exclude.lst
+++ b/config/pkg-exclude.lst
@@ -1,3 +1,6 @@
+# This list was derived from the bcd 'exclude' list, removing any obsolete
+# entries.
+
 # kernel
 kernel-tmb-
 kernel-linus-
@@ -13,13 +16,8 @@ gimp-help-
 hugs98
 icedtea-web
 kde-l10n-handbooks-
-kipi-plugins-dropbox
-kipi-plugins-googleservices
-kipi-plugins-imgurexport
-kipi-plugins-jalbum
-kipi-plugins-piwigo
-kipi-plugins-remotestorage
 manslide
+php-manual-en
 scilab
 scribus
 stellarium
diff --git a/config/pkg-core.lst b/config/pkg-include-core.lst
index 9a49e26..dd0d1f7 100644
--- a/config/pkg-core.lst
+++ b/config/pkg-include-core.lst
@@ -2,6 +2,7 @@
 basesystem
 
 # kernel devel
+i586: kernel-desktop586-devel-latest
 kernel-desktop-devel-latest
 kernel-server-devel-latest
 
@@ -22,9 +23,11 @@ x11-driver-input-void
 # VM support
 virtualbox
 dkms-virtualbox
+i586: virtualbox-kernel-desktop586-latest
 virtualbox-kernel-desktop-latest
 virtualbox-kernel-server-latest
 dkms-vboxadditions
+i586: vboxadditions-kernel-desktop586-latest
 vboxadditions-kernel-desktop-latest
 vboxadditions-kernel-server-latest
 
@@ -62,7 +65,6 @@ grub2
 grub2-efi
 grub2-mageia-theme
 guile1.8
-gvolwheel
 icewm
 kipi-plugins-
 libreoffice-kde4
@@ -84,7 +86,6 @@ os-prober
 pacemaker
 perl-Test-Mock-LWP
 phonon
-phonon-gstreamer
 pidgin
 python-at-spi
 quassel
@@ -96,3 +97,16 @@ taskwarrior
 vnstat
 vpnc
 xawtv
+
+i586:   libSDL_net1.2_0
+i586:   libcares2
+i586:   libossp_uuid-devel
+i586:   libunimrcp-deps
+i586:   libwebkit-gir1.0
+i586:   wine
+
+x86_64: lib64SDL_net1.2_0 
+x86_64: lib64cares2
+x86_64: lib64ossp_uuid-devel
+x86_64: lib64unimrcp-deps
+x86_64: lib64webkit-gir1.0
diff --git a/config/pkg-nonfree.lst b/config/pkg-include-nonfree.lst
index bd48113..356daa9 100644
--- a/config/pkg-nonfree.lst
+++ b/config/pkg-include-nonfree.lst
@@ -5,8 +5,8 @@ dkms-nvidia-current
 kernel-firmware-nonfree
 microcode
 # the nvidia304 packages have a dependency on a 32-bit library
-#nvidia304-cuda-opencl
-#nvidia304-devel
+i586: nvidia304-cuda-opencl
+i586: nvidia304-devel
 nvidia304-doc-html
 nvidia340-cuda-opencl
 nvidia340-devel
diff --git a/config/pkg-to-review.lst b/config/pkg-include-to-review.lst
index 8cc667d..c896995 100644
--- a/config/pkg-to-review.lst
+++ b/config/pkg-include-to-review.lst
@@ -32,12 +32,41 @@ x11-font-misc
 # This is an alternative for webfetch
 aria2
 
+# This is an alternative for typelib(GtkSource)
+i586:   libgtksourceview-gir2.0
+x86_64: lib64gtksourceview-gir2.0
+
 # This is an alternative for pulseaudio-volume-control
 pavucontrol-qt
 
+# These are also provided by the perl package
+perl-Digest-SHA
+perl-Sys-Syslog
+perl-Time-HiRes
+
+# These are alternatives for phonon-backend
+phonon-gstreamer
+phonon-vlc
+
+# This is an alternative for polkit-agent
+polkit-agent-none
+
+# This is an alternative for python-rpm
+python2-rpm
+
 # These are all alternatives for sendmail-command.
 ssmtp sendmail dma msmtp
 
+# This is an alternative for vim
+vim-minimal
+
+# These are (indirectly) required by task-windowmaker, which is in the exclude
+# list. It's not obvious why they are still included.
+gvolwheel
+wmcalclock
+wmsystemtray
+wmudmount
+
 # The automatic expansion of locales in rpmsrate appears not to include all
 # the available locales.
 hunspell-
@@ -45,4 +74,3 @@ 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
index 0ce7fed..6318f5a 100644
--- a/config/rpmsrate-to-fix.lst
+++ b/config/rpmsrate-to-fix.lst
@@ -1,9 +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?
+linuxconsole  # should this be linuxconsoletools?
+pinentry-qt4  # should this be pinentry-qt5?
 pluma-plugins
 python-rpm
+
+# This needs to be qualified by !TYPE"64bit".
+x86_64: kernel-desktop586-latest