From b67df736b3443c0b0841c8da7f15ad5643ce8ca3 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sat, 4 Jan 2014 20:39:28 +0100
Subject: add mga3 final build configs

---
 config/auto_inst.cfg.pl | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

(limited to 'config/auto_inst.cfg.pl')

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 8224b7d..29d4a73 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -83,10 +83,10 @@ $o = {
             	    'imagemagick', 'kipi-plugins-batchprocess', 'kipi-plugins-dngconverter',
             	    'fonts-ttf-decoratives',
                ),
-               'lib64atlas3-x86_64',
+               '/^lib64atlas3-/',
            ),
 	    if_($ENV{DRAKLIVE_ARCH} eq 'i586',
-	        'libatlas3-sse3'),
+	        '/^libatlas3-/',),
 
            if_($ENV{DRAKLIVE_PRODUCT} !~ /gaming/i, #- non-DVD products
                #- from task-kde Suggests
@@ -103,10 +103,10 @@ $o = {
                'nepomuk-scribo',
 
                # need space on kde disks
-               'kdepim4-core', 'kaddressbook', 'knode', 'knotes', 'kontact', 'korganizer', 'nepomuk', 'soprano-plugin-virtuoso',
+               'kdepim4-core', 'kaddressbook', 'knode', 'knotes', 'kontact', 'korganizer', 'nepomuk',
                'kipi-plugins-piwigoexport', 'kipi-plugins-kopete', 'kipi-plugins-panorama', 'kipi-plugins-vkontakte',
                'kipi-plugins-yandexfotki', 'kipi-plugins-smug', 'kipi-plugins-shwup', 'kipi-plugins-flashexport',
-               'kopete',
+               'kopete', 'kactivitymanagerd-nepomuk-plugin',
                'kipi-plugins-expoblending', # pulls in hugin
                'enblend',
 
@@ -144,7 +144,6 @@ $o = {
                'libreoffice-base',
                '/^nvidia.*-doc-html/',
                if_($has_kde4,
-                   'k3b',
                    'liblm_sensors3', 'xpdf-common', 'htdig', 'mirrordir', 'acr38u',
                    'ekiga',
                    'kdeaccessibility4',
@@ -168,11 +167,11 @@ $o = {
            ),
 
            #- bluez-pin provide
-           if_(!$has_kde4, 'kbluetooth'),
+           if_(!$has_kde4, 'kbluetooth'),# 'plasma-applet-kimpanel-backend-ibus'),
 
            if_(!$has_kde4, 'compiz-decorator-kde4'), #- provides compiz-decorator
            if_(!$has_kde4, 'pinentry-qt4'), #- qt4 app
-           'kdebase-kate', 'kdeaddons-kate', #- development tool
+           #'kdebase-kate', 'kdeaddons-kate', #- development tool
            '/noatun/', #- prefer amarok
 	   'rxvt',
 
@@ -199,9 +198,9 @@ $o = {
            'mono',
 
 	   # block the kernels we dont want
-	    if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/'),
-           '/^kernel-netbook-/',
-           '/^kernel-server-/',
+	    if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', 'fglrx-kernel-3.8.13-desktop-1.mga3', 'nvidia-current-kernel-3.8.13-desktop-1.mga3', 'nvidia304-kernel-3.8.13-desktop-1.mga3', 'nvidia173-kernel-3.8.13-desktop-1.mga3', 'vboxadditions-kernel-3.8.13-desktop-1.mga3'),
+           '/^kernel-server-/', 'fglrx-kernel-3.8.13-server-1.mga3', 'nvidia-current-kernel-3.8.13-server-1.mga3', 'nvidia304-kernel-3.8.13-server-1.mga3', 'nvidia173-kernel-3.8.13-server-1.mga3', 'vboxadditions-kernel-3.8.13-server-1.mga3',
+	   '/^broadcom-wl-/',
 
 	   # not needed anymore (mga #2001)
 	   'nspluginwrapper',
@@ -209,6 +208,19 @@ $o = {
 
            #- no distribution license
            'flash-player-plugin',
+           
+           # xguest sucks
+           'xguest',
+           
+           # not wanted (mga #9752)
+           'al-anvar',
+           
+           # broken
+           'audacity',
+           
+           'broadcom-bcma-config', 'broadcom-ssb-config',
+
+	    if_($ENV{DRAKLIVE_REGION} eq 'int', 'ardour', 'ardour3', 'lftp', 'lm_sensors', 'kscd', 'tvtime', 'kamera', '/^plasma-applet-system-monitor-/', 'dragon', 'k3b', ),
        ],
        'default_packages' => [
            if_($has_kde4, "$distro_config-kde4-config"),
@@ -217,18 +229,24 @@ $o = {
 
            if_($has_moblin, 'task-moblin'),
 
-           if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'),
-           if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'),
+           if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0', 'fglrx-kernel-3.8.13-desktop586-1.mga3', 'nvidia-current-kernel-3.8.13-desktop586-1.mga3', 'nvidia304-kernel-3.8.13-desktop586-1.mga3', 'nvidia173-kernel-3.8.13-desktop586-1.mga3', 'vboxadditions-kernel-3.8.13-desktop586-1.mga3'),
+           if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0', 'fglrx-kernel-3.8.13-desktop-1.mga3', 'nvidia-current-kernel-3.8.13-desktop-1.mga3', 'nvidia304-kernel-3.8.13-desktop-1.mga3', 'nvidia173-kernel-3.8.13-desktop-1.mga3', 'vboxadditions-kernel-3.8.13-desktop-1.mga3', 'gummiboot'),
+
+	   'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia173', 'x11-driver-video-nvidia304', 'x11-driver-video-vboxvideo',
 
 	   'usbutils', # we want lsusb
 	   'shared-mime-info', # needed for .desktop files to work atleast in gnome
-
+	   'dmraid', 'mdadm', 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch',
+	   'mageia-doc-mcc-en',
+	   
+	   if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ),
+	   
            #- live resize/install/copy tools
            if_($ENV{DRAKLIVE_MEDIA} eq 'usb', 'draklive-resize'),
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
 
-           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3'),
+           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted',),#, 'ibus-ui-gtk3'),
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
                'samba-client',
-- 
cgit v1.2.1