diff --git a/openmamba-groups.db b/openmamba-groups.db index 8cf5140..0322bb7 100644 --- a/openmamba-groups.db +++ b/openmamba-groups.db @@ -1,7 +1,7 @@ # openmamba base packages database -# Copyright (c) 2008-2016 by Silvan Calarco +# Copyright (c) 2008-2019 by Silvan Calarco -rpm -q desktop-base-kde4 >/dev/null && KDE4_IS_INSTALLED=1 +rpm -q desktop-base-kde >/dev/null && KDE_IS_INSTALLED=1 rpm -q desktop-base-gnome >/dev/null && GNOME_IS_INSTALLED=1 ARCH=`uname -m` @@ -48,7 +48,7 @@ if [ "$ARCH" != "arm" ]; then BASE_PKGS="$BASE_PKGS unrar VirtualBox-vboxguest pcmcia-utils" fi -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then BASE_PKGS="$BASE_PKGS ksnapshot okular kamera \ kleopatra kdemultimedia-audiocd kmix kscd kwalletmanager \ bluedevil kcron ksystemlog kuser kfind kwrite \ @@ -69,7 +69,7 @@ OFFICE_PKGS="\ libreoffice-base libreoffice-math libreoffice-writer libreoffice-impress \ libreoffice-calc libreoffice-filters libreoffice-pyuno libreoffice-draw" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then OFFICE_PKGS="$OFFICE_PKGS kmymoney" fi if [ "$GNOME_IS_INSTALLED" ]; then @@ -80,7 +80,7 @@ fi #libopensync-plugin-syncml libopensync-plugin-palm \ # libopensync-plugin-moto libopensync-plugin-google-calendar" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then OFFICE_PKGS="$OFFICE_PKGS libreoffice-kde" fi @@ -90,7 +90,7 @@ fi OFFICE_EXTRA_PKGS="abiword" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then OFFICE_EXTRA_PKGS="$OFFICE_EXTRA_PKGS koffice kmymoney2" fi @@ -100,7 +100,7 @@ fi MULTIMEDIA_PLAYERS_PKGS="vlc" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then MULTIMEDIA_PLAYERS_PKGS="$MULTIMEDIA_PLAYERS_PKGS amarok kaffeine juk" fi @@ -113,7 +113,7 @@ qsynth hydrogen mixxx audacity muse DVDStyler" MULTIMEDIA_EDITING_EXTRA_PKGS="puredata timidity ardour qtractor rosegarden ZynAddSubFX DVDAuthorWizard \ DVDRipOMatic reKordmydesktop lives" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then MULTIMEDIA_EDITING_PKGS="$MULTIMEDIA_EDITING_PKGS \ kdenlive soundkonverter k3b" elif [ "$GNOME_IS_INSTALLED" ]; then @@ -125,26 +125,27 @@ AUDIO_PKGS="$MULTIMEDIA_PLAYERS_PKGS" AUDIO_PROF_PKGS="$MULTIMEDIA_EDITING_PKGS" VIDEO_PKGS="$MULTIMEDIA_EDITING_PKGS" -INTERNET_PKGS="chromium FileZilla icedtea-web-plugin" +INTERNET_PKGS="firefox FileZilla icedtea-web-plugin" -if [ "$KDE4_IS_INSTALLED" ]; then - INTERNET_PKGS="$INTERNET_PKGS ktorrent kontact kopete kpartsplugin kdeconnect4" +if [ "$KDE_IS_INSTALLED" ]; then + INTERNET_PKGS="$INTERNET_PKGS ktorrent kontact kopete kpartsplugin kdeconnect" elif [ "$GNOME_IS_INSTALLED" ]; then INTERNET_PKGS="$INTERNET_PKGS pigdin ekiga thunderbird totem-mozilla-plugin" else INTERNET_PKGS="$INTERNET_PKGS totem-mozilla-plugin" fi -INTERNET_EXTRA_PKGS="firefox midori moonlight amule" +INTERNET_EXTRA_PKGS="midori moonlight amule" + +if [ "$ARCH" == "x86_64" ]; then + INTERNET_EXTRA_PKGS="chromium $INTERNET_EXTRA_PKGS" +fi GRAPHICS_PKGS="xsane xscreensaver xscreensaver-gl" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then GRAPHICS_PKGS="$GRAPHICS_PKGS calligra-krita digikam gwenview kgamma kruler \ -kamera kcolorchooser kolourpaint kamoso \ -kde4-color-schemes-addons kde4-emoticons-addons kde4-icons-kdeclassic \ -kde4-screensavers kde4-desktoptheme kde4-wallpapers-addons \ -kde4-style-phase" +spectacle kamera kcolorchooser kolourpaint kamoso" else GRAPHICS_PKGS="$GRAPHICS_PKGS gimp cheese" fi @@ -159,7 +160,7 @@ supertux supertuxkart xmoto bomber bovo \ monkey-bubble pathological neverball armagetronad \ moagg knights pinball torcs tuxfootball" -if [ "$KDE4_IS_INSTALLED" ]; then +if [ "$KDE_IS_INSTALLED" ]; then GAMES_PKGS="$GAMES_PKGS ksudoku amor kteatime ktux \ kapman katomic kbattleship kblackbox kblocks kbounce \ kbreakout kdesnake kdiamond kfourinline kgoldrunner killbots kiriki \ @@ -193,7 +194,7 @@ libglitz-devel libxcb-util-devel libpixman-devel libpthread-stubs-devel \ libXv-devel makedepend libdrm-devel libXvMC-devel \ libidn-devel libjack-devel libjpeg-devel liblcms-devel libmng-devel libncurses-devel \ libogg-devel libopenldap-devel libopenssl-devel libpango-devel libpcre-devel \ -libpng-devel libpopt-devel libpython-devel libqt-devel libreadline-devel libraw1394-devel \ +libpng-devel libpopt-devel libpython-devel libqt5-devel libreadline-devel libraw1394-devel \ libsamplerate-devel libSDL-devel libSDL_image-devel libSDL_mixer-devel libSDL_Pango-devel libSM-devel \ libsndfile-devel libstdc++6-devel libtiff-devel libusb-devel libvorbis-devel \ libwxBase-ansi-devel libwxBase-unicode-devel libwxGTK-ansi-devel \ @@ -210,9 +211,8 @@ gtk-doc libgail-devel libdbus-glib-devel intltool xmlto ghostscript-devel imake gccmakedep libXp-devel mercurial gnome-doc-utils-devel gnome-desktop-devel gdb flex \ doxygen" -if [ "$KDE4_IS_INSTALLED" ]; then - DEVEL_PKGS="$DEVEL_PKGS kdelibs-devel kdepimlibs-devel kdebase-workspace-devel \ -kdebase4-devel libphonon-devel" +if [ "$KDE_IS_INSTALLED" ]; then + DEVEL_PKGS="$DEVEL_PKGS" fi SUN_JAVA_PKGS="sun-java"