From 40da3991acdb6e97b30742ef6107b264fd8be44a Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin.whitaker.me.uk>
Date: Wed, 5 Oct 2022 12:28:26 +0100
Subject: Clean up package exclude lists.

Move items that significantly increase the ISO size from the to-review list
to the main list. Drop items that make little difference to the ISO size.
---
 config/pkg-exclude-to-review.lst | 53 --------------------------------
 config/pkg-exclude.lst           | 66 +++++++++++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 67 deletions(-)

diff --git a/config/pkg-exclude-to-review.lst b/config/pkg-exclude-to-review.lst
index e50fba7..78a54b5 100644
--- a/config/pkg-exclude-to-review.lst
+++ b/config/pkg-exclude-to-review.lst
@@ -1,54 +1 @@
 # Temporary exclusions due to broken dependencies.
-pitivi
-
-# This group was derived from the bcd 'exclude_tofix' list, after removing
-# obsolete entries.
-celestia
-xfig
-
-# 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.
-caja-image-converter
-dia
-eom
-libreoffice-emailmerge
-libreoffice-wiki-publisher
-pan
-tvtime
-
-# drakclassic will include all alternative dependencies. These are ones not
-# included before.
-
-adf-*-fonts
-fonts-ttf-al-anvar-*
-google-croscore*-fonts
-google-noto-kufi-arabic*-fonts
-google-noto-naskh-arabic*-fonts
-google-noto-sans-cjk-*-fonts
-google-noto-sans-hebrew*-fonts
-google-noto-sans-mono*-fonts
-google-noto-sans-myanmar*-fonts
-google-noto-serif*-fonts
-google-roboto*-fonts
-mathjax-*-fonts
-sj-*-fonts*
-
-lxqt-notificationd
-lxqt-policykit
-python3-polkit-efl-agent
-skanlite
-taktuk
-urpmi-parallel-*
-
-i586:   polkit-agent-none
-i586:   libcogl-pango-gir2.0
-i586:   libkeybinder-gir0.0
-i586:   libkf5konq-devel
-i586:   libwnck-gir1.0
-
-x86_64: lib64cogl-pango-gir2.0
-x86_64: lib64keybinder-gir0.0
-x86_64: lib64kf5konq-devel
-x86_64: lib64wnck-gir1.0
diff --git a/config/pkg-exclude.lst b/config/pkg-exclude.lst
index 2a0bbb5..9446f23 100644
--- a/config/pkg-exclude.lst
+++ b/config/pkg-exclude.lst
@@ -1,33 +1,70 @@
-# This list was derived from the bcd lists, removing any redundant or obsolete
-# entries. Updated to reduce size of mga8 ISOs.
-
-# kernel
+# Exclude unwanted kernel flavours and sources.
 kernel-linus*
 kernel-source*
 
-# others
+# Exclude some large applications to reduce the ISO size.
 apper
 bijiben
 cascadia-*
+celestia
+dia
+eom
 exaile
 gimp-help-*
-google-noto-sans-hk-fonts
-google-noto-sans-jp-fonts
-google-noto-sans-kr-fonts
-google-noto-sans-sc-fonts
-google-noto-sans-tc-fonts
-java-17-openjdk-headless-slowdebug
+libreoffice-wiki-publisher
 manslide
 ocaml
+pan
 postgresql13*
 scribus
+skanlite
 stellarium
+taktuk
 task-windowmaker
 texlive
+tvtime
+xfig
+
+# This depends on python3-matplotlib, which tries to pull in texlive.
+# The texlive package really needs splitting up.
+pitivi
+
+# Exclude some fonts to reduce the ISO size.
+adf-*-fonts
+fonts-ttf-al-anvar-*
+google-croscore*-fonts
+google-noto-kufi-arabic*-fonts
+google-noto-naskh-arabic*-fonts
+google-noto-sans-hebrew*-fonts
+google-noto-sans-mono*-fonts
+google-noto-sans-myanmar*-fonts
+google-noto-serif*-fonts
+google-roboto*-fonts
+mathjax-*-fonts
+sj-*-fonts*
 x11-font-bh-type1
 
-# These provide a superset of the modules included in perl and perl-base.
-# The subset provided by perl and perl-base is currently sufficient.
+# These fonts are identical to the ones in fonts-otf-source-han.
+google-noto-sans-cjk-*-fonts
+google-noto-sans-hk-fonts
+google-noto-sans-jp-fonts
+google-noto-sans-kr-fonts
+google-noto-sans-sc-fonts
+google-noto-sans-tc-fonts
+
+# Exclude some unnecessary alternatives.
+java-17-openjdk-headless-slowdebug
+lxqt-*
+python3-polkit-efl-agent
+urpmi-parallel-*
+
+i586:   libkf5konq-devel
+
+x86_64: lib64kf5konq-devel
+
+# These are not caught by the script which generates the perl excludes,
+# because they provide a superset of the modules provided in perl and
+# perl-base.
 perl-Filter
 perl-IO-Compress
 perl-IO-Extended
@@ -36,4 +73,5 @@ perl-Scalar-List-Utils
 perl-Text-Tabs+Wrap
 perl-Tie-Watch
 
-#x86_64:firefox-beta
+# This is only present in cauldron and gets removed just before release.
+x86_64:firefox-beta
-- 
cgit v1.2.1