From 24a37f02745ccd6b9bc7136aa47dd16e0d69d5f5 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Wed, 3 Jan 2018 11:07:49 +0000 Subject: Update package lists - no longer need arch specific lists - further reduce differences with bcd --- config/build.cfg | 12 ++--- config/group-include.lst | 67 +++++++++++++++++++++++ config/known-conflicts.lst | 5 ++ config/pkg-core-32.lst | 23 -------- config/pkg-core-64.lst | 5 -- config/pkg-core.lst | 98 ---------------------------------- config/pkg-exclude-to-fix.lst | 4 -- config/pkg-exclude-to-review.lst | 34 ++++++++++++ config/pkg-exclude.lst | 10 ++-- config/pkg-groups.lst | 67 ----------------------- config/pkg-include-core.lst | 112 +++++++++++++++++++++++++++++++++++++++ config/pkg-include-nonfree.lst | 17 ++++++ config/pkg-include-to-review.lst | 76 ++++++++++++++++++++++++++ config/pkg-nonfree.lst | 17 ------ config/pkg-to-review.lst | 48 ----------------- config/rpmsrate-to-fix.lst | 10 ++-- 16 files changed, 325 insertions(+), 280 deletions(-) create mode 100644 config/group-include.lst delete mode 100644 config/pkg-core-32.lst delete mode 100644 config/pkg-core-64.lst delete mode 100644 config/pkg-core.lst delete mode 100644 config/pkg-exclude-to-fix.lst create mode 100644 config/pkg-exclude-to-review.lst delete mode 100644 config/pkg-groups.lst create mode 100644 config/pkg-include-core.lst create mode 100644 config/pkg-include-nonfree.lst create mode 100644 config/pkg-include-to-review.lst delete mode 100644 config/pkg-nonfree.lst delete mode 100644 config/pkg-to-review.lst 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/group-include.lst b/config/group-include.lst new file mode 100644 index 0000000..d77c41a --- /dev/null +++ b/config/group-include.lst @@ -0,0 +1,67 @@ +# Basic system +INSTALL 1 +CAT_SYSTEM 1 +CAT_X 1 +# DEs +CAT_GRAPHICAL_DESKTOP 4 +CAT_CINNAMON 1 +CAT_GNOME 1 +CAT_LXDE 1 +CAT_PLASMA5 1 +CAT_XFCE 1 +# Applications +CAT_ACCESSIBILITY 3 +CAT_ARCHIVING 1 +CAT_AUDIO 1 +CAT_BOOKS 3 +CAT_COMMUNICATIONS 3 +CAT_CONFIG 1 +CAT_EDITORS 4 +CAT_EDUCATION 3 +CAT_EMULATORS 4 +CAT_GRAPHICS 1 +CAT_DATABASES 4 +CAT_DEVELOPMENT 2 +CAT_FILE_TOOLS 1 +CAT_MINIMAL_DOCS 3 +CAT_MONITORING 3 +CAT_NETWORKING_CHAT 3 +CAT_NETWORKING_CHAT_SERVER 5 +CAT_NETWORKING_DNS 3 +CAT_NETWORKING_DNS_SERVER 3 +CAT_NETWORKING_FILE 3 +CAT_NETWORKING_FILE_SERVER 3 +CAT_NETWORKING_FILE_TRANSFER 3 +CAT_NETWORKING_FILE_TRANSFER_SERVER 3 +CAT_NETWORKING_FIREWALLING_SERVER 3 +CAT_NETWORKING_INSTANT_MESSAGING 3 +CAT_NETWORKING_IRC 3 +CAT_NETWORKING_LDAP_SERVER 3 +CAT_NETWORKING_MAIL 4 +CAT_NETWORKING_MAIL_SERVER 5 +CAT_NETWORKING_OTHER 3 +CAT_NETWORKING_OTHER_SERVER 3 +CAT_NETWORKING_REMOTE_ACCESS 3 +CAT_NETWORKING_REMOTE_ACCESS_SERVER 3 +CAT_NETWORKING_WWW 4 +CAT_NETWORKING_WWW_SERVER 5 +CAT_OFFICE 5 +CAT_PRINTER 1 +CAT_PUBLISHING 4 +CAT_SCIENCES 3 +CAT_SHELLS 3 +CAT_SPELLCHECK 5 +CAT_TERMINALS 2 +CAT_TEXT_TOOLS 3 +CAT_TV 3 +CAT_VIDEO 3 +CAT_VIDEO_EDITING 3 +CAT_WIZARDS 3 +PHOTO 3 +SCANNER 4 +# Meta-tasks +task-gnome +task-mate-minimal +task-plasma5 +task-printing-scanning +task-obsolete 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-core.lst b/config/pkg-core.lst deleted file mode 100644 index 9a49e26..0000000 --- a/config/pkg-core.lst +++ /dev/null @@ -1,98 +0,0 @@ -# the minimal system -basesystem - -# kernel devel -kernel-desktop-devel-latest -kernel-server-devel-latest - -# X11 drivers -x11-driver-input-acecad -x11-driver-input-evdev -x11-driver-input-evdev-devel -x11-driver-input-evtouch -x11-driver-input-fpit -x11-driver-input-hyperpen -x11-driver-input-joystick -x11-driver-input-mutouch -x11-driver-input-penmount -x11-driver-input-synaptics -x11-driver-input-vmmouse -x11-driver-input-void - -# VM support -virtualbox -dkms-virtualbox -virtualbox-kernel-desktop-latest -virtualbox-kernel-server-latest -dkms-vboxadditions -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 -afterstep -baobab -bsf -chromium-browser-stable -colorprompt -corosync -cpufreqd -cronie-anacron -dansguardian -Default-kde4-config -drakguard -drbd-utils -efibootmgr -enigma -fluid-soundfont-common -gnome-boxes -gnome-disk-utility -gnome-screenshot -gnome-terminal-nautilus -grub2 -grub2-efi -grub2-mageia-theme -guile1.8 -gvolwheel -icewm -kipi-plugins- -libreoffice-kde4 -mageiawelcome -marble -mariadb-extra -mariadb-feedback -mariadb-obsolete -mathplot -midori -minicom -mplayer-gui -msec-gui -net_monitor -netprofile-plugin-network -openssh-askpass-common -openvpn -os-prober -pacemaker -perl-Test-Mock-LWP -phonon -phonon-gstreamer -pidgin -python-at-spi -quassel -rsyslog -smplayer -sushi -system-config-printer -taskwarrior -vnstat -vpnc -xawtv 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-groups.lst b/config/pkg-groups.lst deleted file mode 100644 index d77c41a..0000000 --- a/config/pkg-groups.lst +++ /dev/null @@ -1,67 +0,0 @@ -# Basic system -INSTALL 1 -CAT_SYSTEM 1 -CAT_X 1 -# DEs -CAT_GRAPHICAL_DESKTOP 4 -CAT_CINNAMON 1 -CAT_GNOME 1 -CAT_LXDE 1 -CAT_PLASMA5 1 -CAT_XFCE 1 -# Applications -CAT_ACCESSIBILITY 3 -CAT_ARCHIVING 1 -CAT_AUDIO 1 -CAT_BOOKS 3 -CAT_COMMUNICATIONS 3 -CAT_CONFIG 1 -CAT_EDITORS 4 -CAT_EDUCATION 3 -CAT_EMULATORS 4 -CAT_GRAPHICS 1 -CAT_DATABASES 4 -CAT_DEVELOPMENT 2 -CAT_FILE_TOOLS 1 -CAT_MINIMAL_DOCS 3 -CAT_MONITORING 3 -CAT_NETWORKING_CHAT 3 -CAT_NETWORKING_CHAT_SERVER 5 -CAT_NETWORKING_DNS 3 -CAT_NETWORKING_DNS_SERVER 3 -CAT_NETWORKING_FILE 3 -CAT_NETWORKING_FILE_SERVER 3 -CAT_NETWORKING_FILE_TRANSFER 3 -CAT_NETWORKING_FILE_TRANSFER_SERVER 3 -CAT_NETWORKING_FIREWALLING_SERVER 3 -CAT_NETWORKING_INSTANT_MESSAGING 3 -CAT_NETWORKING_IRC 3 -CAT_NETWORKING_LDAP_SERVER 3 -CAT_NETWORKING_MAIL 4 -CAT_NETWORKING_MAIL_SERVER 5 -CAT_NETWORKING_OTHER 3 -CAT_NETWORKING_OTHER_SERVER 3 -CAT_NETWORKING_REMOTE_ACCESS 3 -CAT_NETWORKING_REMOTE_ACCESS_SERVER 3 -CAT_NETWORKING_WWW 4 -CAT_NETWORKING_WWW_SERVER 5 -CAT_OFFICE 5 -CAT_PRINTER 1 -CAT_PUBLISHING 4 -CAT_SCIENCES 3 -CAT_SHELLS 3 -CAT_SPELLCHECK 5 -CAT_TERMINALS 2 -CAT_TEXT_TOOLS 3 -CAT_TV 3 -CAT_VIDEO 3 -CAT_VIDEO_EDITING 3 -CAT_WIZARDS 3 -PHOTO 3 -SCANNER 4 -# Meta-tasks -task-gnome -task-mate-minimal -task-plasma5 -task-printing-scanning -task-obsolete diff --git a/config/pkg-include-core.lst b/config/pkg-include-core.lst new file mode 100644 index 0000000..dd0d1f7 --- /dev/null +++ b/config/pkg-include-core.lst @@ -0,0 +1,112 @@ +# 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 +x11-driver-input-evdev-devel +x11-driver-input-evtouch +x11-driver-input-fpit +x11-driver-input-hyperpen +x11-driver-input-joystick +x11-driver-input-mutouch +x11-driver-input-penmount +x11-driver-input-synaptics +x11-driver-input-vmmouse +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 +afterstep +baobab +bsf +chromium-browser-stable +colorprompt +corosync +cpufreqd +cronie-anacron +dansguardian +Default-kde4-config +drakguard +drbd-utils +efibootmgr +enigma +fluid-soundfont-common +gnome-boxes +gnome-disk-utility +gnome-screenshot +gnome-terminal-nautilus +grub2 +grub2-efi +grub2-mageia-theme +guile1.8 +icewm +kipi-plugins- +libreoffice-kde4 +mageiawelcome +marble +mariadb-extra +mariadb-feedback +mariadb-obsolete +mathplot +midori +minicom +mplayer-gui +msec-gui +net_monitor +netprofile-plugin-network +openssh-askpass-common +openvpn +os-prober +pacemaker +perl-Test-Mock-LWP +phonon +pidgin +python-at-spi +quassel +rsyslog +smplayer +sushi +system-config-printer +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-include-nonfree.lst b/config/pkg-include-nonfree.lst new file mode 100644 index 0000000..356daa9 --- /dev/null +++ b/config/pkg-include-nonfree.lst @@ -0,0 +1,17 @@ +bluez-firmware +dkms-nvidia304 +dkms-nvidia340 +dkms-nvidia-current +kernel-firmware-nonfree +microcode +# the nvidia304 packages have a dependency on a 32-bit library +i586: nvidia304-cuda-opencl +i586: nvidia304-devel +nvidia304-doc-html +nvidia340-cuda-opencl +nvidia340-devel +nvidia340-doc-html +nvidia-current-cuda-opencl +nvidia-current-devel +nvidia-current-doc-html +radeon-firmware diff --git a/config/pkg-include-to-review.lst b/config/pkg-include-to-review.lst new file mode 100644 index 0000000..c896995 --- /dev/null +++ b/config/pkg-include-to-review.lst @@ -0,0 +1,76 @@ +# 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 + +# 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- +kde-l10n-bs +# Need to fix the conflict on this one +#kde-l10n-ca-valencia +kde-l10n-ia diff --git a/config/pkg-nonfree.lst b/config/pkg-nonfree.lst deleted file mode 100644 index bd48113..0000000 --- a/config/pkg-nonfree.lst +++ /dev/null @@ -1,17 +0,0 @@ -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 -nvidia340-cuda-opencl -nvidia340-devel -nvidia340-doc-html -nvidia-current-cuda-opencl -nvidia-current-devel -nvidia-current-doc-html -radeon-firmware diff --git a/config/pkg-to-review.lst b/config/pkg-to-review.lst deleted file mode 100644 index 8cc667d..0000000 --- a/config/pkg-to-review.lst +++ /dev/null @@ -1,48 +0,0 @@ -# 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 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 -- cgit v1.2.1