Updated for drakclassic rework.

No longer need to handle rpmsrate errors or package conflicts.
drakclassic now includes all alternatives by default, so need to
drop some includes and add some excludes.

9 files changed, 246 insertions, 135 deletions

diff --git a/config/build.cfg b/config/build.cfg
index 478625b..290f761 100644
--- a/config/build.cfg
+++ b/config/build.cfg
@@ -22,8 +22,7 @@ my $arch2 = $arch eq 'i586' ? 'i386' : $arch;
 my $_c = {
     repo => {
         classes => [ qw(core nonfree) ],
-#        types   => [ qw(release updates) ],
-        types   => [ qw(release) ],
+        types   => [ qw(release updates) ],
     },
     media_cfg => {
         askmedia => 1,
@@ -32,9 +31,6 @@ my $_c = {
     group_include_lists => [
         'config/group-include.lst',
     ],
-    group_exclude_lists => [
-        'config/rpmsrate-to-fix.lst',
-    ],
     package_include_lists => [
         'config/pkg-include-core.lst',
         'config/pkg-include-nonfree.lst',
@@ -44,8 +40,6 @@ my $_c = {
         'config/pkg-exclude.lst',
         'config/pkg-exclude-to-review.lst',
     ],
-    known_conflicts =>
-        'config/known-conflicts.lst',
     copy_from_repo => [
         'autorun.inf'               => 'files/autorun.inf',
         'dosutils'                  => 'files/dosutils',
diff --git a/config/group-include.lst b/config/group-include.lst
index d77c41a..02e9dda 100644
--- a/config/group-include.lst
+++ b/config/group-include.lst
@@ -1,7 +1,11 @@
+# This list was derived from the bcd lists, removing any redundant or obsolete
+# entries.
+
 # Basic system
 INSTALL 1
 CAT_SYSTEM 1
 CAT_X 1
+
 # DEs
 CAT_GRAPHICAL_DESKTOP 4
 CAT_CINNAMON 1
@@ -9,6 +13,7 @@ CAT_GNOME 1
 CAT_LXDE 1
 CAT_PLASMA5 1
 CAT_XFCE 1
+
 # Applications
 CAT_ACCESSIBILITY 3
 CAT_ARCHIVING 1
@@ -59,6 +64,7 @@ CAT_VIDEO_EDITING 3
 CAT_WIZARDS 3
 PHOTO 3
 SCANNER 4
+
 # Meta-tasks
 task-gnome
 task-mate-minimal
diff --git a/config/known-conflicts.lst b/config/known-conflicts.lst
deleted file mode 100644
index fabe510..0000000
--- a/config/known-conflicts.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-# These are expected
-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-exclude-to-review.lst b/config/pkg-exclude-to-review.lst
index 8c0632a..3e461d4 100644
--- a/config/pkg-exclude-to-review.lst
+++ b/config/pkg-exclude-to-review.lst
@@ -1,13 +1,13 @@
-# This section was derived from the bcd 'exclude_tofix' list, removing any
+# This group was derived from the bcd 'exclude_tofix' list, after removing
 # 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.
+# The bcd 'input_cat' list included a large number of kipi plugins.
+# 'pkg-include-core.lst' includes 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
@@ -15,20 +15,235 @@ 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.
+# This is the only hunspell locale 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
+# drakclassic will include all alternative dependencies. These are ones not
+# included before.
 
+aajohan-comfortaa-fonts
+adf-*-fonts
+bitmap-console-fonts
+bitmap-lucida-typewriter-fonts
+fonts-ttf-Inconsolata
+fonts-ttf-al-anvar-*
+fonts-ttf-dejavu-lgc
+fonts-ttf-libertine
+gdouros-symbola-fonts
+google-croscore*-fonts
+google-droid-sans-mono-fonts
+google-droid-serif-fonts
+google-noto-kufi-arabic*-fonts
+google-noto-naskh-arabic*-fonts
+google-noto-sans-fonts
+google-noto-sans-hebrew*-fonts
+google-noto-sans-myanmar*-fonts
+google-noto-sans-ui-fonts
+google-noto-serif-fonts
+google-roboto*-fonts
+lato-fonts
+mathjax-*-fonts
+nethack-bitmap-fonts
+sj-*-fonts*
+terminus-font
+x11-font-adobe-utopia-type1
+
+classpath
+iceape
+java-1.8.0-openjdk-devel
+lxqt-notificationd
+lxqt-policykit
+maxscale
+mozldap
+nikto
+pix
+postgresql9.4*
+qutim
+skanlite
+sssd-libwbclient
+taktuk
+urpmi-parallel-*
+
+i586:   openimageio
+
+i586:   polkit-agent-none
+x86_64: python-polkit-efl-agent
+
+i586:   libclutter-gst-gir2.0
+i586:   libcogl-pango-gir2.0
+i586:   libecpg9.4_6
+i586:   libgcj16
+i586:   libgst-gir0.10
+i586:   libgstreamer-plugins-base-gir0.10
+i586:   libjavascriptcore-gir1.0
+i586:   libkeybinder-gir0.0
+i586:   libkf5konq-devel
+i586:   libkwin-devel
+i586:   libvte-gir0.0
+i586:   libvte-gir2.90
+i586:   libwnck-gir1.0
+
+x86_64: lib64clutter-gst-gir2.0
+x86_64: lib64cogl-pango-gir2.0
+x86_64: lib64ecpg9.4_6
+x86_64: lib64gcj16
+x86_64: lib64gst-gir0.10
+x86_64: lib64gstreamer-plugins-base-gir0.10
+x86_64: lib64javascriptcore-gir1.0
+x86_64: lib64keybinder-gir0.0
+x86_64: lib64kf5konq-devel
+x86_64: lib64kwin-devel
+x86_64: lib64vte-gir0.0
+x86_64: lib64vte-gir2.90
+x86_64: lib64wnck-gir1.0
+
+perl-Alt-Crypt-RSA-BigInt
+perl-App-Rad
+perl-App-perlall
+perl-AppConfig
+perl-Archive-Tar
+perl-Archive-Zip
+perl-Attribute-Handlers
+perl-Bytes-Random-Secure
+perl-CPAN
+perl-CPAN-Checksums
+perl-CPAN-Meta
+perl-CPAN-Meta-Requirements
+perl-CPAN-Meta-YAML
+perl-Class-ErrorHandler
+perl-Class-Loader
+perl-Compress-Bzip2
+perl-Compress-Raw-Bzip2
+perl-Compress-Raw-Zlib
+perl-Convert-ASCII-Armour
+perl-Convert-ASN1
+perl-Convert-PEM
+perl-Crypt-Blowfish
+perl-Crypt-CAST5_PP
+perl-Crypt-CBC
+perl-Crypt-DES
+perl-Crypt-DES_EDE3
+perl-Crypt-DSA
+perl-Crypt-IDEA
+perl-Crypt-OpenPGP
+perl-Crypt-Primes
+perl-Crypt-RIPEMD160
+perl-Crypt-RSA
+perl-Crypt-Random
+perl-Crypt-Random-Seed
+perl-Crypt-Random-TESHA2
+perl-Crypt-Rijndael
+perl-Crypt-Twofish
+perl-Data-Buffer
+perl-Data-Compare
+perl-Data-Dumper
+perl-Data-Section-Simple
+perl-Devel-PatchPerl
+perl-Devel-Platform-Info
+perl-Digest
+perl-Digest-MD2
+perl-Digest-MD5
+perl-Encode
+perl-Expect
+perl-ExtUtils-CBuilder
+perl-ExtUtils-Manifest
+perl-ExtUtils-ParseXS
+perl-File-Find-Rule
+perl-File-pushd
+perl-Filter
+perl-Filter-Simple
+perl-HTTP-Tiny
+perl-IO-Compress
+perl-IO-Tty
+perl-IO-Zlib
+perl-IPC-Cmd
+perl-IPC-SysV
+perl-JSON-PP
+perl-Locale-Codes
+perl-Locale-Maketext
+perl-Locale-Maketext-Lexicon
+perl-Locale-Maketext-Simple
+perl-MIME-Base64
+perl-Math-Pari
+perl-Math-Prime-Util
+perl-Math-Random-ISAAC
+perl-Memoize
+perl-Module-CoreList
+perl-Module-Extract-Namespaces
+perl-Module-Load
+perl-Module-Load-Conditional
+perl-Module-Metadata
+perl-Module-Signature
+perl-Number-Compare
+perl-Params-Check
+perl-Parse-CPAN-Meta
+perl-PathTools
+perl-Perl-OSType
+perl-Pod-Escapes
+perl-Pod-POM
+perl-Pod-Parser
+perl-Pod-Perldoc
+perl-Pod-Simple
+perl-Regexp-Common
+perl-Safe
+perl-Scalar-List-Utils
+perl-SelfLoader
+perl-Socket
+perl-Sort-Versions
+perl-Template-Toolkit
+perl-Term-ReadLine
+perl-Test-LeakTrace
+perl-Text-Abbrev
+perl-Text-Balanced
+perl-Text-Glob
+perl-Text-Haml
+perl-Tie-EncryptedHash
+perl-Tie-Watch
+perl-Time-Piece
+perl-Unicode-Collate
+perl-Unicode-Normalize
+perl-YAML-LibYAML
+perl-YAML-Syck
+perl-any
+perl-bignum
+perl-first
+perl-parent
+perl-threads
+perl-threads-shared
+
+x86_64: perl-AutoLoader
+x86_64: perl-Carp
+x86_64: perl-Exporter
+x86_64: perl-ExtUtils-Install
+x86_64: perl-ExtUtils-MakeMaker
+x86_64: perl-File-Path
+x86_64: perl-File-Temp
+x86_64: perl-Getopt-Long
+x86_64: perl-IO-Extended
+x86_64: perl-IO-Socket-IP
+x86_64: perl-Math-BigInt
+x86_64: perl-Math-Complex
+x86_64: perl-Net-Ping
+x86_64: perl-Term-ANSIColor
+x86_64: perl-Test-Harness
+x86_64: perl-Test-Simple
+x86_64: perl-Text-ParseWords
+x86_64: perl-Text-Tabs+Wrap
+x86_64: perl-Tie-RefHash
+x86_64: perl-Time-Local
+x86_64: perl-XSLoader
+x86_64: perl-autodie
+x86_64: perl-autouse
+x86_64: perl-constant
+x86_64: perl-libnet
+x86_64: perl-podlators
+x86_64: perl-pragma-base
diff --git a/config/pkg-exclude.lst b/config/pkg-exclude.lst
index b47c947..c3c820d 100644
--- a/config/pkg-exclude.lst
+++ b/config/pkg-exclude.lst
@@ -1,21 +1,21 @@
-# This list was derived from the bcd 'exclude' list, removing any obsolete
+# This list was derived from the bcd lists, removing any redundant or obsolete
 # entries.
 
 # kernel
-kernel-tmb-
-kernel-linus-
-kernel-source-
+kernel-tmb-*
+kernel-linus-*
+kernel-source-*
 
 # others
 anjuta
 apper
 bijiben
 exaile
-flash-player-
-gimp-help-
+flash-player-*
+gimp-help-*
 hugs98
 icedtea-web
-kde-l10n-handbooks-
+kde-l10n-handbooks-*
 manslide
 php-manual-en
 scilab
diff --git a/config/pkg-include-core.lst b/config/pkg-include-core.lst
index dd0d1f7..536b5eb 100644
--- a/config/pkg-include-core.lst
+++ b/config/pkg-include-core.lst
@@ -1,11 +1,9 @@
+# This list was derived from the bcd lists, removing any redundant or obsolete
+# entries.
+
 # the minimal system
 basesystem
 
-# kernel devel
-i586: kernel-desktop586-devel-latest
-kernel-desktop-devel-latest
-kernel-server-devel-latest
-
 # X11 drivers
 x11-driver-input-acecad
 x11-driver-input-evdev
@@ -22,23 +20,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
 
 # fonts
-google-noto-fonts-common
-samyak-devanagari-fonts
-samyak-gujarati-fonts
-samyak-malayalam-fonts
-samyak-oriya-fonts
-samyak-tamil-fonts
-sazanami-fonts-common
 x11-font-wqy-bitmapfont
 
 # others
@@ -66,7 +52,7 @@ grub2-efi
 grub2-mageia-theme
 guile1.8
 icewm
-kipi-plugins-
+kipi-plugins-*
 libreoffice-kde4
 mageiawelcome
 marble
@@ -85,7 +71,6 @@ openvpn
 os-prober
 pacemaker
 perl-Test-Mock-LWP
-phonon
 pidgin
 python-at-spi
 quassel
@@ -99,14 +84,8 @@ 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-include-nonfree.lst b/config/pkg-include-nonfree.lst
index 356daa9..542598f 100644
--- a/config/pkg-include-nonfree.lst
+++ b/config/pkg-include-nonfree.lst
@@ -1,3 +1,6 @@
+# This list was derived from the bcd lists, removing any redundant or obsolete
+# entries.
+
 bluez-firmware
 dkms-nvidia304
 dkms-nvidia340
diff --git a/config/pkg-include-to-review.lst b/config/pkg-include-to-review.lst
index c896995..6b7bac8 100644
--- a/config/pkg-include-to-review.lst
+++ b/config/pkg-include-to-review.lst
@@ -1,64 +1,5 @@
 # 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 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
+# automatically included by drakclassic.
 
 # These are (indirectly) required by task-windowmaker, which is in the exclude
 # list. It's not obvious why they are still included.
@@ -66,11 +7,3 @@ gvolwheel
 wmcalclock
 wmsystemtray
 wmudmount
-
-# 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
deleted file mode 100644
index 6318f5a..0000000
--- a/config/rpmsrate-to-fix.lst
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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
-
-# This needs to be qualified by !TYPE"64bit".
-x86_64: kernel-desktop586-latest