Release 3.0.5

r8169: system-sleep hook for module unloading as a workaround for driver not working after resume from suspend
Release 3.0.4
2016-03-08 12:09:12 +01:00 · 2016-03-08 12:08:39 +01:00 · 2016-02-12 11:30:02 +01:00 · 2016-02-12 11:27:22 +01:00 · 2016-02-12 11:17:33 +01:00 · 2016-02-12 11:13:38 +01:00
20 changed files with 290 additions and 235 deletions
--- a/5
+++ b/5
@@ -14,8 +14,6 @@ SRPMSVERSIONSFILE = SRPMSVERSIONS
 pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack \
            sun-java7 spotify chromium-pepper-flash
 endif
-include $(SRPMSVERSIONSFILE)
-
 PACKAGE = desktop-base-openmamba
 DISTROID = openmamba

@@ -69,6 +67,7 @@ xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
 xdg_mergedmenudir = $(xdg_menudir)/applications-merged
 systemdsystemdir = /lib/systemd/system
+systemdsleepdir = /lib/systemd/system-sleep

 distrorootdir = ${datadir}/$(DISTROid)
 distrobindir = ${distrorootdir}/bin
@@ -150,12 +149,14 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
+	@$(INSTALL_DIR) $(DESTDIR)$(systemdsleepdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/profile.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/
 	cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
+	cp etc/system-sleep/* $(DESTDIR)$(systemdsleepdir)/
 	chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh
 	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
--- a/SRPMS/b43-firmware/LICENSE
+++ b/SRPMS/b43-firmware/LICENSE
@@ -5,6 +5,6 @@ The firmware from the binary drivers is Copyright by Broadcom Corporation and mu

 =======================================================

-Press the "I agree" button if you have read and understood this text and accept to download and install the Adobe Flash Plugin.
+Press the "I agree" button if you have read and understood this text and accept to download and install the Broadcom wireless chip firmware.

 Press "I do not agree" if you want this script to terminate immediately without performing any futher operation.
--- a/SRPMS/b43-firmware/b43-firmware.spec.in
+++ b/SRPMS/b43-firmware/b43-firmware.spec.in
@@ -64,6 +64,8 @@ rm -fr ${tmpdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
+++ b/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
@@ -52,6 +52,8 @@ rm -fr ${tmpdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/chromium-pepper-flash/distroutils.sysconfig.in
+++ b/SRPMS/chromium-pepper-flash/distroutils.sysconfig.in
@@ -1,7 +1,7 @@
 ## Google Chrome's pepper-flash

 # package name (do not modify unless you know what you're doing)
-CHROMIUM_PEPPER_FLASH_PCK=google-chrome-stable-${SRPMVERSION["chromium-pepper-flash"]}-1.@arch@.rpm
+CHROMIUM_PEPPER_FLASH_PCK=google-chrome-stable_current_@arch@.rpm

 # package URL (do not modify unless you know what you're doing)
-CHROMIUM_PEPPER_FLASH_URL=http://dl.google.com/linux/chrome/rpm/stable/@arch@/
+CHROMIUM_PEPPER_FLASH_URL=https://dl.google.com/linux/direct/
--- a/SRPMS/flashplugin/flashplugin.spec.in
+++ b/SRPMS/flashplugin/flashplugin.spec.in
@@ -59,6 +59,8 @@ rm -fr ${tmpdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/msttcorefonts/msttcorefonts.spec.in
+++ b/SRPMS/msttcorefonts/msttcorefonts.spec.in
@@ -33,6 +33,8 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 The TrueType core fonts for the web that was once available from http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly constructed so that the actual fonts are downloaded from Sourceforge's site at build time. Therefore this package technically does not 'redistribute' the fonts, it just makes it easy to install them on a linux system.

 %prep
+%setup -c -n %{name}-%{version} -D -T
+
 rm -rf %{name}
 mkdir %{name}
 cd %{name}
@@ -83,6 +85,8 @@ cp *.ttf %{buildroot}%{fontdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %post
 /usr/bin/fc-cache
--- a/SRPMS/skype/skype.spec.in
+++ b/SRPMS/skype/skype.spec.in
@@ -14,6 +14,7 @@ BuildPrereq:   wget
 BuildPrereq:   /usr/bin/tempfile
 # NOTE: requires the backward compatible version of the libstdc++ library
 Requires:      pulseaudio
+Requires:      libv4l.i586
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root

 %description
@@ -98,6 +99,8 @@ _EOF

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/spotify/spotify-make-20150129.tar.gz
+++ b/SRPMS/spotify/spotify-make-20150129.tar.gz
--- a/SRPMS/spotify/spotify.spec.in
+++ b/SRPMS/spotify/spotify.spec.in
@@ -1,4 +1,3 @@
-#% define spotify_make_ver 20130831git
 Name:          spotify
 Version:       @SRPMVERSION@
 Release:       @SRPMRELEASE@
@@ -9,9 +8,12 @@ Distribution:  @distribution@
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://www.spotify.com/us/download/previews/
 ## GITSOURCE https://github.com/leamas/spotify-make.git master
-Source:        https://github.com/leamas/spotify-make/tarball/master/spotify-make-%{version}.tar.gz
+#Source:        https://github.com/leamas/spotify-make/tarball/master/spotify-make-%{version}.tar.gz
 Source1:       LICENSE
 License:       Not distributable
+BuildRequires: git
+Requires:      libopenssl100
+Requires:      zenity
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
@@ -20,8 +22,9 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 Listen to music using Spotify.

 %prep
-%setup -q -c
-mv leamas-spotify-make-*/* .
+%setup -q -c -T
+git clone --depth=1 https://github.com/leamas/spotify-make.git
+mv spotify-make/* .

 %build
 ./configure \
@@ -42,8 +45,13 @@ mv %{buildroot}/opt/spotify/share/appdata %{buildroot}%{_datadir}
 install -d -m0755 %{buildroot}%{_bindir}
 ln -s /opt/spotify/bin/spotify %{buildroot}%{_bindir}/spotify

+ln -sf /usr/lib64/libcrypto.so.1.0.0 %{buildroot}/opt/spotify/lib/spotify-client/libcrypto.so.1.0.0
+ln -sf /usr/lib64/libssl.so.1.0.0 %{buildroot}/opt/spotify/lib/spotify-client/libssl.so.1.0.0
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+rm -rf %{_builddir}/%{name}-*
+:

 %pre
 if [ $1 -ge 1 ]; then
@@ -84,9 +92,12 @@ fi
 %dir /opt/spotify/share
 %dir /opt/spotify/share/spotify-client/
 /opt/spotify/share/spotify-client/*
-%{_mandir}/man1/spotify.1.gz
+%{_mandir}/man1/spotify.1*

 %changelog
+* Thu Aug 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 20150629-1mamba
+- fetch spotify-make from git
+
 * Thu Jan 29 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 20150129-1mamba
 - updated

--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/SRPMS/sun-java7/sun-java7.spec.in
@@ -308,6 +308,8 @@ rm -f %{buildroot}%{_jvmdir}/%{jredir}/lib/*/fxavcodecplugin-52.so

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %pre
 if [ $1 -ge 1 ]; then
--- a/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
+++ b/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
@@ -40,21 +40,23 @@ wget -nv --timeout=10 --tries=2 \
 declare -A SRPMVERSION SRPMRELEASE
 . /etc/sysconfig/@sysconfigfile@

-install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}/opt/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}
+install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}%{_libdir}/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}
 cp %{S:0} LICENSE

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %post
 #VBoxManage extpack uninstall Oracle_VM_VirtualBox_Extension_Pack || true
-VBoxManage extpack install /opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack --replace
+VBoxManage extpack install %{_libdir}/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack --replace
 # not working
 :

 %files
 %defattr(-,root,root)
-/opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
+%{_libdir}/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
 %doc LICENSE

 %changelog
--- a/SRPMS/win32codecs/win32codecs.spec.in
+++ b/SRPMS/win32codecs/win32codecs.spec.in
@@ -92,6 +92,8 @@ find . -type f -exec install -D "{}" "%{buildroot}%{win32dir}/{}" \;

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/36
+++ b/36
@@ -2,26 +2,40 @@
 SRPMVERSION["b43-firmware"]=4.150.10.5
 SRPMRELEASE["b43-firmware"]=1mamba
 # flashplugin
-SRPMVERSION["flashplugin"]="`curl -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
-SRPMRELEASE["flashplugin"]=1mamba
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "flashplugin" ]; then
+  SRPMVERSION["flashplugin"]="`curl --max-time 20 -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
+  SRPMRELEASE["flashplugin"]=1mamba
+fi
 # msttcorefonts
 SRPMVERSION["msttcorefonts"]=1.3
 SRPMRELEASE["msttcorefonts"]=7mamba
 # skype
-SRPMVERSION["skype"]="`curl -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|" 2>/dev/null`"
-SRPMRELEASE["skype"]=2mamba
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "skype" ]; then
+  SRPMVERSION["skype"]="`curl --max-time 20 -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|"|grep -v "\.\.0\." 2>/dev/null`"
+  SRPMRELEASE["skype"]=2mamba
+fi
 # spotify
-SRPMVERSION["spotify"]=20150129
+if [ "`uname -m`" == "x86_64" ]; then
+SRPMVERSION["spotify"]=20150629
+else
+SRPMVERSION["spotify"]=0
+fi
 SRPMRELEASE["spotify"]=1mamba
 # sun-java7
-SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
-SRPMRELEASE["sun-java7"]=1mamba
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
+  SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+  SRPMRELEASE["sun-java7"]=1mamba
+fi
 # virtualbox-extension-pack
-SRPMVERSION["virtualbox-extension-pack"]=4.3.20
-SRPMRELEASE["virtualbox-extension-pack"]=1mamba
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "virtualbox-extension-pack" ]; then
+  SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`"
+  SRPMRELEASE["virtualbox-extension-pack"]=1mamba
+fi
 # win32codecs
 SRPMVERSION["win32codecs"]=20110131
 SRPMRELEASE["win32codecs"]=1mamba
 # chromium-pepper-flash
-SRPMVERSION["chromium-pepper-flash"]="`curl -s "http://googlechromereleases.blogspot.it/" | grep -m 1 "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`"
-SRPMRELEASE["chromium-pepper-flash"]=1mamba
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "chromium-pepper-flash" ]; then
+  SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -s "http://googlechromereleases.blogspot.it/" | grep -i -m 1 "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`"
+  SRPMRELEASE["chromium-pepper-flash"]=1mamba
+fi
--- a/SRPMSVERSIONS.arm
+++ b/SRPMSVERSIONS.arm
@@ -1,2 +1,2 @@
-SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
 SRPMRELEASE["sun-java7"]=1mamba
--- a/2
+++ b/2
@@ -1 +1 @@
-VERSION = 2.9.90
+VERSION = 3.0.5
--- a/etc/system-sleep/r8169
+++ b/etc/system-sleep/r8169
@@ -0,0 +1,9 @@
+#!/bin/bash
+TMPFILE=/tmp/system-sleep-hook-r8169.tmp
+if [ "$1/$2" = "pre/suspend" ]; then
+   rmmod r8169
+   touch $TMPFILE
+elif [ "$1/$2" = "post/suspend" -a -e $TMPFILE ]; then
+   modprobe r8169
+   rm -f $TMPFILE
+fi
--- a/mambabase/mambabase.kmdr
+++ b/mambabase/mambabase.kmdr
@@ -841,85 +841,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                <set>WordBreak|AlignVCenter</set>
            </property>
        </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>checkform3</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>0</x>
-                    <y>370</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@BackBox.setChecked(true)
-@NextBox.setChecked(true)
-rpm -q xorg-drv-video-nvidia &amp;&amp; {
-   dcop @dcopid KommanderIf setEnabled inst_nvidia false
-}
-
-rpm -q xorg-drv-video-nvidia_304 &amp;&amp; {
-   dcop @dcopid KommanderIf setEnabled inst_nvidia_legacy false
-}
-
-rpm -q xorg-drv-video-fglrx &amp;&amp; {
-   dcop @dcopid KommanderIf setEnabled inst_fglrx false
-}
-
-rpm -q xorg-drv-video-fglrx &amp;&amp; {
-   dcop @dcopid KommanderIf setEnabled inst_fglrx_legacy false
-}
-
-openmamba-netsrpms -c flashplugin &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_flash false
-fi
-
-openmamba-netsrpms -c msttcorefonts &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_msttcf false
-fi
-
-openmamba-netsrpms -c win32codecs &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_codecs false
-fi
-
-openmamba-netsrpms -c sun-java7 &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_java false
-fi
-
-openmamba-netsrpms -c skype &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_skype false
-fi
-
-openmamba-netsrpms -c broadcom-sta &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false
-fi
-
-openmamba-netsrpms -c b43-firmware &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_b43 false
-fi
-
-openmamba-netsrpms -c spotify &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_spotify false
-fi
-
-openmamba-netsrpms -c virtualbox-extension-pack &gt; /dev/null
-if [ $? -eq 0 ]; then
-   dcop @dcopid KommanderIf setEnabled inst_virtualbox false
-fi</string>
-                </stringlist>
-            </property>
-        </widget>
        <widget class="GroupBox">
            <property name="name">
                <cstring>GroupBox2_2_2</cstring>
@@ -950,7 +871,7 @@ fi</string>
            </widget>
            <widget class="CheckBox">
                <property name="name">
-                    <cstring>inst_nvidia_legacy</cstring>
+                    <cstring>inst_nvidia</cstring>
                </property>
                <property name="enabled">
                    <bool>true</bool>
@@ -958,13 +879,16 @@ fi</string>
                <property name="geometry">
                    <rect>
                        <x>20</x>
-                        <y>40</y>
+                        <y>20</y>
                        <width>510</width>
                        <height>20</height>
                    </rect>
                </property>
                <property name="text">
-                    <string>NVIDIA propri&amp;etary video driver (legacy) from openmamba.org</string>
+                    <string>NVIDIA proprietary video &amp;driver (autodetected) from openmamba.org</string>
+                </property>
+                <property name="tristate">
+                    <bool>false</bool>
                </property>
                <property name="associations" stdset="0">
                    <stringlist>
@@ -981,6 +905,32 @@ fi</string>
                <property name="enabled">
                    <bool>true</bool>
                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>40</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>AMD/ATI propri&amp;etary video driver from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_fglrx_legacy</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
                <property name="geometry">
                    <rect>
                        <x>20</x>
@@ -990,7 +940,59 @@ fi</string>
                    </rect>
                </property>
                <property name="text">
-                    <string>AMD/ATI proprietary video driver from openmamba.org</string>
+                    <string>AMD/ATI proprietary video driver (le&amp;gacy) from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_broadcom_sta</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>80</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Broadcom-sta proprietary wireless driver from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_b43</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>100</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&amp;Broadcom B43 proprietary firmware from openwrt.org</string>
                </property>
                <property name="associations" stdset="0">
                    <stringlist>
@@ -1107,6 +1109,28 @@ fi</string>
                    </stringlist>
                </property>
            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_codecs</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>180</y>
+                        <width>500</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&amp;Win32 codecs from mplayerhq.hu</string>
+                </property>
+                <property name="checked">
+                    <bool>false</bool>
+                </property>
+            </widget>
            <widget class="CheckBox">
                <property name="name">
                    <cstring>inst_msttcf</cstring>
@@ -1143,7 +1167,7 @@ fi</string>
                <property name="geometry">
                    <rect>
                        <x>20</x>
-                        <y>140</y>
+                        <y>120</y>
                        <width>510</width>
                        <height>20</height>
                    </rect>
@@ -1157,7 +1181,7 @@ fi</string>
            </widget>
            <widget class="CheckBox">
                <property name="name">
-                    <cstring>inst_codecs</cstring>
+                    <cstring>inst_pepperflash</cstring>
                </property>
                <property name="enabled">
                    <bool>true</bool>
@@ -1165,125 +1189,18 @@ fi</string>
                <property name="geometry">
                    <rect>
                        <x>20</x>
-                        <y>180</y>
-                        <width>500</width>
+                        <y>139</y>
+                        <width>510</width>
                        <height>20</height>
                    </rect>
                </property>
                <property name="text">
-                    <string>&amp;Win32 codecs from mplayerhq.hu</string>
+                    <string>Pepper-Flas&amp;h plugin for chromium from google.com</string>
                </property>
                <property name="checked">
                    <bool>false</bool>
                </property>
            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_nvidia</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>20</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>NVIDIA proprietary video &amp;driver from openmamba.org</string>
-                </property>
-                <property name="tristate">
-                    <bool>false</bool>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_fglrx_legacy</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>80</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>AMD/ATI proprietary video driver (le&amp;gacy) from openmamba.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_b43</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>120</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>&amp;Broadcom B43 proprietary firmware from openwrt.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_broadcom_sta</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>100</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Broadcom-sta proprietary wireless driver from openmamba.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
        </widget>
        <widget class="Label">
            <property name="name">
@@ -1305,6 +1222,86 @@ WARNING: you'll have to accept a license agreement for most selected packages.</
                <set>WordBreak|AlignTop</set>
            </property>
        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>checkform3</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>0</x>
+                    <y>370</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@BackBox.setChecked(true)
+@NextBox.setChecked(true)
+rpm -q xorg-drv-video-nvidia || rpm -q xorg-drv-video-nvidia_304 || rpm -q xorg-drv-video-nvidia_340 &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_nvidia false
+}
+
+rpm -q xorg-drv-video-fglrx &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_fglrx false
+}
+
+rpm -q xorg-drv-video-fglrx &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_fglrx_legacy false
+}
+
+openmamba-netsrpms -c flashplugin &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_flash false
+fi
+
+openmamba-netsrpms -c chromium-pepper-flash &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_pepperflash false
+fi
+
+openmamba-netsrpms -c msttcorefonts &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_msttcf false
+fi
+
+openmamba-netsrpms -c win32codecs &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_codecs false
+fi
+
+openmamba-netsrpms -c sun-java7 &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_java false
+fi
+
+openmamba-netsrpms -c skype &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_skype false
+fi
+
+openmamba-netsrpms -c broadcom-sta &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false
+fi
+
+openmamba-netsrpms -c b43-firmware &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_b43 false
+fi
+
+openmamba-netsrpms -c spotify &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_spotify false
+fi
+
+openmamba-netsrpms -c virtualbox-extension-pack &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_virtualbox false
+fi</string>
+                </stringlist>
+            </property>
+        </widget>
    </widget>
    <widget class="QWidget">
        <property name="name">
@@ -1478,11 +1475,11 @@ INSTALL_VIRTUALIZATION='@inst_virtualization.checked()'
 INSTALL_SERVER='@inst_server.checked()'
 INSTALL_DEVEL='@inst_devel.checked()'
 INSTALL_FLASH='@inst_flash.checked()'
+INSTALL_PEPPERFLASH='@inst_pepperflash.checked()'
 INSTALL_CODECS='@inst_codecs.checked()'
 INSTALL_MSTTCF='@inst_msttcf.checked()'
 INSTALL_SKYPE='@inst_skype.checked()'
 INSTALL_NVIDIA='@inst_nvidia.checked()'
-INSTALL_NVIDIA_LEGACY='@inst_nvidia_legacy.checked()'
 INSTALL_FGLRX='@inst_fglrx.checked()'
 INSTALL_FGLRX_LEGACY='@inst_fglrx_legacy.checked()'
 INSTALL_BROADCOM_STA='@inst_broadcom_sta.checked()'
--- a/mambabase/mambabase.sh
+++ b/mambabase/mambabase.sh
@@ -1,5 +1,5 @@
 # openmamba post installation script
-# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2015 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License

@@ -77,12 +77,12 @@ TOTAL_PROGRESS=10
 [ "$INSTALL_SERVER" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 15`
 [ "$INSTALL_DEVEL" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 15`
 [ "$INSTALL_FLASH" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
+[ "$INSTALL_PEPPERFLASH" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_SKYPE" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_CODECS" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_MSTTCF" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_JAVA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_NVIDIA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
-[ "$INSTALL_NVIDIA_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_FGLRX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_FGLRX_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_BROADCOM_STA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
@@ -106,6 +106,8 @@ if [ "$INSTALL_BASE" = "1" ]; then
   # first time: remove mambabase from autostart
   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
+   [ -e /home/$USER/.config/autostart/mambabase.desktop ] && \
+      rm -f /home/$USER/.config/autostart/mambabase.desktop
   # ugly workaround: don't have permissions to rm file in /etc/xdg/autostart
   [ -e /etc/xdg/autostart/mambabase.desktop ] && \
      > /etc/xdg/autostart/mambabase.desktop
@@ -172,15 +174,10 @@ if [ "$INSTALL_DEVEL" = "1" ]; then
 fi

 if [ "$INSTALL_NVIDIA" = "1" ]; then
-   echo $"Installing NVIDIA proprietary video driver packages"
-   dcop_write $"Installing/updating NVIDIA proprietary video driver packages..." 10
-   rpm -q --whatprovides xorg-drv-video-nvidia >/dev/null || apt_get_parsed install -y xorg-drv-video-nvidia
-fi
-
-if [ "$INSTALL_NVIDIA_LEGACY" = "1" ]; then
-   echo $"Installing NVIDIA proprietary (legacy) video driver packages"
-   dcop_write $"Installing/updating NVIDIA proprietary (legacy) video driver packages..." 10
-   rpm -q --whatprovides xorg-drv-video-nvidia_304 >/dev/null || apt_get_parsed install -y xorg-drv-video-nvidia_304
+   echo $"Installing NVIDIA proprietary video driver (autodetected) packages"
+   dcop_write $"Installing/updating NVIDIA proprietary video driver (autodetected) packages..." 10
+   NVIDIA_DETECTED=$(/sbin/nvidia-autoselect-driver | sed "s|.* ||")
+   rpm -q --whatprovides $NVIDIA_DETECTED >/dev/null || apt_get_parsed install -y $NVIDIA_DETECTED
 fi

 if [ "$INSTALL_FGLRX" = "1" ]; then
@@ -227,10 +224,16 @@ if [ "$INSTALL_FLASH" = "1" ]; then
   nspluginscan
   rpm -q gnash && {
      echo $"Removing gnash"
-      sudo rpm -e gnash      
+      sudo rpm -e gnash
   }
 fi

+if [ "$INSTALL_PEPPERFLASH" = "1" ]; then
+   echo $"Installing pepper-flash plugin"
+   dcop_write $"Installing Pepper-Flash plugin..." 10
+   /usr/bin/openmamba-netsrpms chromium-pepper-flash
+fi
+
 if [ "$INSTALL_CODECS" = "1" ]; then
   echo $"Installing win32 codecs"
   dcop_write $"Installing Win32 codecs..." 10
--- a/openmamba-update/openmamba-netsrpms
+++ b/openmamba-update/openmamba-netsrpms
@@ -44,9 +44,10 @@ function check_if_already_installed() {
 }

 declare -A SRPMVERSION SRPMRELEASE
-. /etc/sysconfig/netsrpminstall || exit 1

 for pckname in $PACKAGES; do
+   export SRPMCHECK="$pckname"
+   . /etc/sysconfig/netsrpminstall || exit 1

   SRPM_PATH=$DISTRO_SRPMS_DIR/${pckname}
   SPEC_PATHNAME=$SRPM_PATH/${pckname}.spec
Author	SHA1	Message	Date
Silvan Calarco	9ab6dc2fb7	Release 3.0.5	2016-03-08 12:09:12 +01:00
Silvan Calarco	582526fc08	r8169: system-sleep hook for module unloading as a workaround for driver not working after resume from suspend	2016-03-08 12:08:39 +01:00
Silvan Calarco	94d9fb5882	Release 3.0.4	2016-02-12 11:30:02 +01:00
Silvan Calarco	d4479c117c	openmamba-netsrpms: only run curl to check version for specified component, not all	2016-02-12 11:27:22 +01:00
Silvan Calarco	fcb13665a0	Release 3.0.3	2016-02-12 11:17:33 +01:00
Silvan Calarco	2df4b31c4b	SRPMSVERSION: add --max-time also to other curl invocations	2016-02-12 11:13:38 +01:00
Silvan Calarco	48755a089f	SRPMS: clean builddir for each package (including previous versions)	2016-02-12 11:01:35 +01:00
Silvan Calarco	8463b462e2	SRPMVERSION: fix for skype version retrieving and add curl timeout when fetching adobe version	2016-02-12 11:00:02 +01:00
Silvan Calarco	1aa1b2d379	skype: require libv4l.i586	2015-10-20 20:09:59 +02:00
Silvan Calarco	e22ffd5cb5	Release 3.0.2	2015-08-26 15:45:53 +02:00
Silvan Calarco	2b6bc00cdb	spotify: update, fetch from git and disable check on 32 bit systems	2015-08-26 15:44:36 +02:00
Silvan Calarco	c2cac1a9ba	virtualbox-extension-pack: support for 5.0.2 and for autoupdate	2015-08-26 15:15:45 +02:00
Silvan Calarco	474169a815	b43-firmware: small fix in LICENSE	2015-05-21 16:11:34 +02:00
Silvan Calarco	b670cf748a	Release 3.0.1	2015-05-17 20:48:16 +02:00
Silvan Calarco	89f03c5d15	mambabase: autodetect NVIDIA proprietary driver and add chromium-pepper-flash	2015-05-17 19:45:53 +02:00
Silvan Calarco	7ed703c52e	Release 3.0.0	2015-04-30 19:13:16 +02:00
Silvan Calarco	10e2f77897	spotify: fix links to wrong openssl library version	2015-04-30 19:11:29 +02:00
Silvan Calarco	546f7ae273	spotify: update spotify-make to 20150430 (git)	2015-04-30 18:54:40 +02:00
Silvan Calarco	1d2c278c24	mambabase.sh: remove first-boot autostart file also if in new xdg location for autostart	2015-04-30 16:41:50 +02:00
Silvan Calarco	e26a2de609	Release 2.9.94	2015-04-24 17:10:59 +02:00
Silvan Calarco	8312b5cbe9	chromium-pepper-flash: fix version check and download url	2015-04-24 17:06:16 +02:00
Silvan Calarco	8535042828	chromium-pepper-flash: update download link	2015-04-19 21:44:13 +02:00
Silvan Calarco	33bab006eb	chromium-pepper-flash: restore version retrieval	2015-04-19 21:42:25 +02:00
Silvan Calarco	d81cfa32c4	Release 2.9.92	2015-03-26 13:23:55 +01:00
Silvan Calarco	b8280278af	chromium-pepper-flash: stop automatic updates for now, as download link for latest version is broken	2015-03-26 13:22:46 +01:00
Silvan Calarco	54e2c0d700	Release 2.9.91	2015-03-04 20:44:23 +01:00
Silvan Calarco	edcace9494	chromium-pepper-flash: fix check for latest version	2015-03-04 20:35:49 +01:00