Release 2.4.6

(need to remember where I made a working one)

Makefile

@@ -1,9 +1,19 @@
-# Makefile for openmamba-desktop-base
-# Copyright (C) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Makefile for desktop-base-openmamba package
+# Copyright (C) 2004-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 include VERSION
-include SRPMSVERSIONS
+
+ARCH:=`uname -i`
+
+ifeq ($(ARCH), arm)
+SRPMSVERSIONSFILE = SRPMSVERSIONS.arm
+pck_srpms = b43-firmware sun-java7
+else
+SRPMSVERSIONSFILE = SRPMSVERSIONS
+pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack sun-java7 spotify
+endif
+include $(SRPMSVERSIONSFILE)
 
 PACKAGE = desktop-base-openmamba
 DISTROID = openmamba
@@ -60,6 +70,7 @@ xdg_appsdir = ${datadir}/applications
 xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
 xdg_mergedmenudir = $(xdg_menudir)/applications-merged
+systemdsystemdir = /lib/systemd/system
 
 distrorootdir = ${datadir}/$(DISTROid)
 distrobindir = ${distrorootdir}/bin
@@ -73,8 +84,6 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_DIR = ${INSTALL} -d -m 755
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-#pck_srpms = flashplugin jre msttcorefonts win32codecs
-pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack sun-java7
 
 pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
@@ -91,14 +100,17 @@ pck_desktop := $(wildcard desktop/*.tar.bz2)
 pck_catalogs := $(wildcard mambabase/po/*.po)
 pck_catalogs1 := $(wildcard mambawelcome/po/*.po)
 pck_catalogs2 := $(wildcard bootrecover/po/*.po)
+pck_catalogs3 := $(wildcard openmamba-update/po/*.po)
 
 .SUFFIXES:
 .SUFFIXES: .in .po .mo
 
 .in:; @echo "generating $@..."; \
+       if [ "$(ARCH)" != "x86_64" -a "$(ARCH)" != "arm" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
        sed "s,@distroID@,$(DISTROID),g;\
             s,@distroid@,$(DISTROid),g;\
             s,@distroicon@,$(DISTROICON),g;\
+            s,@arch@,$$ARCH,g;\
             s,@distribution@,$(RPM_DISTRIBUTION),g;\
             s,@distroext@,$(RPM_DISTROEXT),g;\
             s,@vendor@,$(RPM_VENDOR),g;\
@@ -109,12 +121,7 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
             s,@distrodesktopdir@,$(distrodesktopdir),g;\
             s,@distrosrpmsdir@,$(distrosrpmsdir),g;\
             s,@wallpaper@,$(DEFAULT_WALLPAPER),g;\
-            s,@screensaver@,${SCREENSAVER},g;\
-            s,@flashpluginver@,${FLASHPLUGIN_VERSION},g;\
-            s,@win32codecsver@,${WIN32CODECS_VERSION},g;\
-            s,@sunjava7ver@,${SUN_JAVA7_VERSION},g;\
-            s,@virtualboxextensionpackver@,${VIRTUALBOX_EXTENSION_PACK_VERSION},g;\
-            s,@skypever@,${SKYPE_VERSION},g" $< > $@
+            s,@screensaver@,${SCREENSAVER},g" $< > $@
 
 all: dist-update locales
 
@@ -146,6 +153,13 @@ install-locales: locales
 	   $(INSTALL_DIR) $$dir;\
 	   $(INSTALL_DATA) $${f/.po/.mo} $$dir/bootrecover.mo;\
 	done
+	@for f in $(pck_catalogs3); do\
+	   lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\
+	   echo "installing i18n file for language \`$$lang'...";\
+	   dir="$(DESTDIR)$(datadir)/locale/$$lang/LC_MESSAGES";\
+	   $(INSTALL_DIR) $$dir;\
+	   $(INSTALL_DATA) $${f/.po/.mo} $$dir/openmamba-update.mo;\
+	done
 
 install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
@@ -162,7 +176,11 @@ endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	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)/
+	chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh
 	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
@@ -198,11 +216,11 @@ install-distromenu: dist-update
 install-srpms:
 	@$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir)
-	@cat SRPMSVERSIONS > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
+	@cat $(SRPMSVERSIONSFILE) > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
 	for pck in $(pck_srpms); do\
-	   rpmbuild -bs SRPMS/$$pck/$${pck}.spec \
-	      --define="_sourcedir `pwd`/SRPMS/$$pck" \
-	      --define="_srcrpmdir $(DESTDIR)$(distrosrpmsdir)" || exit 1;\
+	   cp -a SRPMS/$$pck $(DESTDIR)$(distrosrpmsdir); \
+	   rm -f $(DESTDIR)$(distrosrpmsdir)/$$pck/distroutils.sysconfig*; \
+	   rm -f $(DESTDIR)$(distrosrpmsdir)/$$pck/*.spec.in; \
 	   cat SRPMS/$$pck/$(pck_sysconfigfile) >> \
 	      $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE);\
 	done
@@ -243,17 +261,18 @@ endif
 install-mambawelcome:
 ifeq ($(WITHKDE3TOOLS),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambawelcomedatadir)
-	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/rc.d/{init.d,rc5.d}
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
+	@$(INSTALL_DIR) $(DESTDIR)$(systemdsystemdir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.kmdr $(DESTDIR)$(mambawelcomedatadir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.sh $(DESTDIR)$(mambawelcomedatadir)
-	$(INSTALL_SCRIPT) mambawelcome/mambawelcome-init $(DESTDIR)$(sysconfdir)/rc.d/init.d/mambawelcome
+	$(INSTALL_SCRIPT) mambawelcome/mambawelcome-init $(DESTDIR)$(mambawelcomedatadir)/mambawelcome
 	$(INSTALL_DATA) gpl.html $(DESTDIR)$(mambawelcomedatadir)/gpl.html
 	$(INSTALL_DATA) gpl-it.html $(DESTDIR)$(mambawelcomedatadir)/gpl-it.html
 	$(INSTALL_DATA) gpl-es.html $(DESTDIR)$(mambawelcomedatadir)/gpl-es.html
 	$(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kdeconfigdir)/kcmfonts
 	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
-	ln -s ../init.d/mambawelcome $(DESTDIR)$(sysconfdir)/rc.d/rc5.d/S99mambawelcome
+	$(INSTALL_DATA) mambawelcome/mambawelcome.service $(DESTDIR)$(systemdsystemdir)/mambawelcome.service
+	$(INSTALL_DATA) mambawelcome/mambawelcome.target $(DESTDIR)$(systemdsystemdir)/mambawelcome.target
 endif
 
 install-xramdr:

SRPMS/b43-firmware/b43-firmware.spec.in

@@ -1,6 +1,6 @@
 Name:          b43-firmware
-Version:       1
-Release:       1@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       Broadcom firmware files for the b43 and b43legacy drivers
 Group:         System/Kernel and Hardware
@@ -22,6 +22,7 @@ Broadcom firmware files for the b43 and b43legacy drivers.
 %setup -c -n %{name}-%{version} -T
 
 [ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+declare -A SRPMVERSION SRPMRELEASE
 . /etc/sysconfig/@sysconfigfile@
 
 [ "${B43_FIRMWARE_PCK}" ] || exit 1

SRPMS/b43-firmware/distroutils.sysconfig

@@ -1,7 +1,7 @@
 ## Broadcom B43 firmware
 
 # package name (do not modify unless you know what you're doing)
-B43_FIRMWARE_PCK=broadcom-wl-4.150.10.5.tar.bz2
+B43_FIRMWARE_PCK=broadcom-wl-${SRPMVERSION["b43-firmware"]}.tar.bz2
 
 # package URL (do not modify unless you know what you're doing)
 B43_FIRMWARE_URL=http://mirror2.openwrt.org/sources/

SRPMS/flashplugin/distroutils.sysconfig.in

@@ -1,7 +1,7 @@
 ## Adobe Flash Plugin
 
 # package name (do not modify unless you know what you're doing)
-FLASH_PLUGIN_PCK=install_flash_player_11_linux_i386.tar.gz
+FLASH_PLUGIN_PCK=install_flash_player_11_linux.@arch@.tar.gz
 
 # package URL (do not modify unless you know what you're doing)
-FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/
+FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${SRPMVERSION["flashplugin"]}/

SRPMS/flashplugin/flashplugin.spec.in

@@ -1,6 +1,6 @@
 Name:          flashplugin
-Version:       @flashpluginver@
-Release:       1@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       Macromedia Flash plugin for web browsers
 Group:         Applications/Web
@@ -24,6 +24,7 @@ Macromedia Flash plugin for web browsers.
 %setup -c -n %{name}-%{version} -D -T
 
 [ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+declare -A SRPMVERSION SRPMRELEASE
 . /etc/sysconfig/@sysconfigfile@
 
 [ "${FLASH_PLUGIN_PCK}" ] || exit 1

SRPMS/jre.pregpl/LICENSE

@@ -1,189 +0,0 @@
-Sun JRE installation - please read carefully
-============================================
-
-Sun Microsystems, Inc.  Binary Code License Agreement
-
-READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE
-TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
-MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE
-TERMS OF THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE
-ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING
-THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE
-TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE
-OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED
-ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS
-AGREEMENT.
-
-1.  LICENSE TO USE.  Sun grants you a non-exclusive and
-non-transferable license for the internal use only of the accompanying
-software and documentation and any error corrections provided by Sun
-(collectively "Software"), by the number of users and the class of
-computer hardware for which the corresponding fee has been paid.
-
-2.  RESTRICTIONS  Software is confidential and copyrighted. Title to
-Software and all associated intellectual property rights is retained by
-Sun and/or its licensors.  Except as specifically authorized in any
-Supplemental License Terms, you may not make copies of Software, other
-than a single copy of  Software for archival purposes.  Unless
-enforcement is prohibited by applicable law, you may not modify,
-decompile, or reverse engineer Software.  You acknowledge that Software
-is not designed, licensed or intended for use in the design,
-construction, operation or maintenance of any nuclear facility.  Sun
-disclaims any express or implied warranty of fitness for such uses.  No
-right, title or interest in or to any trademark, service mark, logo or
-trade name of Sun or its licensors is granted under this Agreement.  "
-3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety
-(90) days from the date of purchase, as evidenced by a copy of the
-receipt, the media on which Software is furnished (if any) will be free
-of defects in materials and workmanship under normal use.  Except for
-the foregoing, Software is provided "AS IS".  Your exclusive remedy and
-Sun's entire liability under this limited warranty will be at Sun's
-option to replace Software media or refund the fee paid for Software.
-
-4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL
-EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE
-EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN
-NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
-PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR
-PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY,
-ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE,
-EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no
-event will Sun's liability to you, whether in contract, tort (including
-negligence), or otherwise, exceed the amount paid by you for Software
-under this Agreement.  The foregoing limitations will apply even if the
-above stated warranty fails of its essential purpose.
-
-6.  Termination.  This Agreement is effective until terminated.  You
-may terminate this Agreement at any time by destroying all copies of
-Software.  This Agreement will terminate immediately without notice
-from Sun if you fail to comply with any provision of this Agreement.
-Upon Termination, you must destroy all copies of Software.
-
-7.  Export Regulations.  All Software and technical data delivered
-under this Agreement are subject to US export control laws and may be
-subject to export or import regulations in other countries.  You agree
-to comply strictly with all such laws and regulations and acknowledge
-that you have the responsibility to obtain such licenses to export,
-re-export, or import as may be required after delivery to you.
-
-8.  U.S. Government Restricted Rights.  If Software is being acquired
-by or on behalf of the U.S. Government or by a U.S. Government prime
-contractor or subcontractor (at any tier), then the Government's rights
-in Software and accompanying documentation will be only as set forth in
-this Agreement; this is in accordance with 48 CFR 227.7201 through
-227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48
-CFR 2.101 and 12.212 (for non-DOD acquisitions).
-
-9.  Governing Law.  Any action related to this Agreement will be
-governed by California law and controlling U.S. federal law.  No choice
-of law rules of any jurisdiction will apply.
-
-10.  Severability. If any provision of this Agreement is held to be
-unenforceable, this Agreement will remain in effect with the provision
-omitted, unless omission would frustrate the intent of the parties, in
-which case this Agreement will immediately terminate.
-
-11.  Integration.  This Agreement is the entire agreement between you
-and Sun relating to its subject matter.  It supersedes all prior or
-contemporaneous oral or written communications, proposals,
-representations and warranties and prevails over any conflicting or
-additional terms of any quote, order, acknowledgment, or other
-communication between the parties relating to its subject matter during
-the term of this Agreement.  No modification of this Agreement will be
-binding, unless in writing and signed by an authorized representative
-of each party.
-
-For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio
-Road, Palo Alto, California 94303
-
-JAVATM 2 RUNTIME ENVIRONMENT VERSION 1.3
-SUPPLEMENTAL LICENSE TERMS
-
-These supplemental license terms ("Supplemental Terms") add to or
-modify the terms of the Binary Code License Agreement (collectively,
-the "Agreement"). Capitalized terms not defined in these Supplemental
-Terms shall have the same meanings ascribed to them in the Agreement.
-These Supplemental Terms shall supersede any inconsistent or
-conflicting terms in the Agreement, or in any license contained within
-the Software.
-
-1. License to Distribute. Subject to the terms and conditions of this
-Agreement, including, but not limited to, Section 2 (Redistributables)
-and Section 3 (Java Technology Restrictions) of these Supplemental
-Terms, Sun grants you a non-exclusive, non-transferable, limited
-license to reproduce and distribute the Software in binary code form
-only, provided that you (i) distribute the Software complete and
-unmodified, only as part of, and for the sole purpose of running your
-Java applet or application ("Program") into which the Software is
-incorporated, (ii) do not distribute additional software intended to
-replace any component(s) of the Software, (iii) do not remove or alter
-any proprietary legends or notices contained in the Software, (iv) only
-distribute the Program subject to a license agreement that protects
-Sun's interests consistent with the terms contained in this Agreement,
-and (v) agree to defend and indemnify Sun and its licensors from and
-against any damages, costs, !  liabilities, settlement amounts and/or
-expenses (including attorneys' fees) incurred in connection with any
-claim, lawsuit or action by any third party that arises or results from
-the use or distribution of any and all Programs and/or Software.
-
-2. Redistributables. In addition to the license granted in Paragraph 1
-above, Sun grants you a non-exclusive, non-transferable, limited
-license to reproduce and distribute, only as part of Software, those
-files specifically identified as redistributable in the Software
-"README" file (the "Redistributables") provided that: (a) you
-distribute the Redistributables complete and unmodified (unless
-otherwise specified in the applicable README file), and only bundled as
-part of the JavaTM applets and applications that you develop (the
-"Programs:); (b)  you do not distribute additional software intended to
-supersede any component(s) of the Redistributables; (c) you do not
-remove or alter any proprietary legends or notices contained in or on
-the Redistributables;  (d) you only distribute the Redistributables
-pursuant to a license agreement that protects Sun's interests
-consistent with the terms contained in the Agreement; and (e)  you
-agree to defend and indemnify Sun and its licensor!  s from and against
-any damages, costs, liabilities, settlement amounts and/or expenses
-(including attorneys' fees) incurred in connection with any claim,
-lawsuit or action by any third party that arises or results from the
-use or distribution of any and all Programs and/or Software.
-
-3. Java Technology Restrictions. You may not modify the Java Platform
-Interface ("JPI", identified as classes contained within the "java"
-package or any subpackages of the "java" package), by creating
-additional classes within the JPI or otherwise causing the addition to
-or modification of the classes in the JPI.  In the event that you
-create an additional class and associated API(s) which (i) extends the
-functionality of a Java platform, and (ii) is exposed to third party
-software developers for the purpose of developing additional software
-which invokes such additional API, you must promptly publish broadly an
-accurate specification for such API for free use by all developers.
-You may not create, or authorize your licensees to create additional
-classes, interfaces, or subpackages that are in any way identified as
-"java", "javax", "sun" or similar convention as specified by Sun in any
-class file naming convention.
-
-4. Trademarks and Logos. You acknowledge and agree as between you and
-Sun that Sun owns the Java trademark and all Java-related trademarks,
-service marks, logos and other brand designations including the Coffee
-Cup logo and Duke logo ("Java Marks"), and you agree to comply with the
-Sun Trademark and Logo Usage Requirements currently located at
-http://www.sun.com/policies/trademarks. Any use you make of the Java
-Marks inures to Sun's benefit.
-
-5. Source Code. Software may contain source code that is provided
-solely for reference purposes pursuant to the terms of this Agreement.
-Source code may not be redistributed.
-
-6. Termination. Sun may terminate this Agreement immediately should any
-Software become, or in Sun's opinion be likely to become, the subject
-of a claim of infringement of a patent, trade secret, copyright or
-other intellectual property right.
-
-============================================
-
-Press the "I agree" button if you have read and understood this text and accept to download and install the SUN Java Runtime Environment (JRE).
-
-Press "I do not agree" if you want this script to terminate immediately without performing any futher operation

SRPMS/jre.pregpl/distroutils.sysconfig

@@ -1,9 +0,0 @@
-## Java Runtime Environment (JRE)
-
-#download parameters (do not modify unless you know what you're doing)
-JRE_VER=6
-JRE_ARCH=i586
-JRE_NSVER=7
-JRE_URL=http://mirror.ncc.up.pt/Java/Java${JRE_VER}/JRE
-JRE_PCK=jre-${JRE_VER}-linux-${JRE_ARCH}.bin
-

SRPMS/jre.pregpl/java-profile.in

@@ -1,13 +0,0 @@
-# @distroID@ configuration:
-# Silvan Calarco <silvan.calarco@mambasoft.it>
-# Davide Madrisan <davide.madrisan@qilinux.it>
-#
-# Java Environment definitions for @distroID@
-#
-if ! echo ${PATH} |grep -q /usr/java/jre/bin ; then
-    PATH="$PATH:/usr/java/jre/bin"
-fi
-
-JAVA_HOME=/usr/java/jre
-
-export JAVA_HOME

SRPMS/jre.pregpl/jre.spec.in

@@ -1,140 +0,0 @@
-Name:          jre
-Version:       0.9
-Release:       1@distroext@
-Epoch:         1
-Summary:       The Java Runtime Environment
-Group:         System/Libraries/Java
-Vendor:        @vendor@
-Distribution:  @distribution@
-Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://java.sun.com
-Source0:       java-profile
-Source1:       LICENSE
-License:       JAVA
-Obsoletes:     j2re
-Provides:      j2re = %{version}
-AutoReqProv:   no
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-
-%description
-The Java Runtime Environment consists of the Java virtual machine, the Java
-platform core classes, and supporting files.
-It is the runtime part of the Java SDK, but without the development tools
-such as compilers and debuggers.
-
-%prep
-%setup -q -D -T -c
-[ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
-. /etc/sysconfig/@sysconfigfile@
-
-[ -z "$JRE_URL" -o -z "$JRE_PCK" ] && exit 1
-
-# get the file list available at %{URL}...
-wget -nv --timeout=5 --tries=2 -c ${JRE_URL}/${JRE_PCK} || {
-   rm -f $JRE_PCK
-   wget -nv --timeout=5 --tries=2 --progress=bar ${JRE_URL}/${JRE_PCK};
-}
-
-#find . -name ${JRE_PCK}* -exec mv {} ${JRE_PCK} \;
-
-%build
-
-%install
-[ "%{buildroot}" != / ] && rm -rf %{buildroot}
-
-[ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
-. /etc/sysconfig/@sysconfigfile@
-
-[ -z "$JRE_URL" -o -z "$JRE_PCK" ] && exit 1
-
-install -d %{buildroot}%{_prefix}/java
-pushd %{buildroot}%{_prefix}/java
-
-MORE="-400" sh %{_builddir}/%{name}-%{version}/${JRE_PCK} << EOF
-yes
-EOF
-
-popd
-
-javapath="$(\
-   find %{buildroot}%{_prefix}/java/ -maxdepth 1 -name jre\* -type d | \
-   sed "s|^%{buildroot}||" 2>/dev/null)"
-
-[ "$javapath" ] || exit 1
-
-ln -s ${javapath} %{buildroot}%{_prefix}/java/jre
-
-install -d %{buildroot}%{_sysconfdir}/profile.d
-cp %{S:0} %{buildroot}%{_sysconfdir}/profile.d/java.sh
-
-# see <http://www.java.com/it/download/help/5000010500.xml#install>
-install -d %{buildroot}%{_libdir}/mozilla/plugins
-ln -s %{_prefix}/java/jre/plugin/i386/ns${JRE_NSVER}/libjavaplugin_oji.so \
-   %{buildroot}%{_libdir}/mozilla/plugins
-ln -s %{_prefix}/java/jre/plugin/i386/ns${JRE_NSVER}/libjavaplugin_oji.so \
-   %{buildroot}%{_libdir}/mozilla/plugins/libjavaplugin.so
-
-#ln -s /usr/java/jre/plugin/i386/ns7-gcc29/libjavaplugin_oji.so \
-#   %{buildroot}%{_libdir}/mozilla/plugins
-
-rm -rf %{buildroot}${javapath}/.systemPrefs
-
-# get the list of the installed files
-find %{buildroot}${javapath} \( -type f -or -type l \) | \
-   sed "s|^%{buildroot}||" > jrefiles.list
-echo "%dir ${javapath}" >> jrefiles.list
-
-%clean
-[ "%{buildroot}" != / ] && rm -rf %{buildroot}
-
-%post
-if [ $1 -eq 1 ]; then
-# new install
-   if ! echo ${PATH} | grep -q /usr/java/jre/bin; then
-      export PATH="$PATH:/usr/java/jre/bin"
-   fi
-fi
-exit 0
-
-%files -f jrefiles.list
-%defattr(-,root,root)
-%{_prefix}/java/jre
-%{_libdir}/mozilla/plugins/libjavaplugin_oji.so
-%{_libdir}/mozilla/plugins/libjavaplugin.so
-%{_sysconfdir}/profile.d/java.sh
-
-%changelog
-* Fri Feb 02 2007 Davide Madrisan <davide.madrisan@qilinux.it> 0.9-1qilnx
-- get download parameters from a sysconfig file
-
-* Tue Oct 31 2006 Davide Madrisan <davide.madrisan@qilinux.it> 1.5.0-8qilnx
-- specfile updated to donwload latest jre version (1.5.0_09)
-
-* Wed Jul 12 2006 Davide Madrisan <davide.madrisan@qilinux.it> 1.5.0-7qilnx
-- added "provides j2re" (needed by the limewire rpm)
-
-* Mon Apr 03 2006 Davide Madrisan <davide.madrisan@qilinux.it> 1.5.0-6qilnx
-- updated javaurl
-
-* Thu Feb 02 2006 Davide Madrisan <davide.madrisan@qilinux.it> 1.5.0-5qilnx
-- fixed symbolic link in %{_libdir}/mozilla/plugins
-
-* Tue Aug 23 2005 Davide Madrisan <davide.madrisan@qilinux.it> 1.5.0-4qilnx
-- specfile updates for last jre version (1.5.0_04)
-
-* Thu Jul 07 2005 Silvan Calarco <silvan.calarco@qilinux.it> 1.5.0-3qilnx
-- remove %{javapath}/.systemPrefs if found
-
-* Wed Apr 20 2005 Silvan Calarco <silvan.calarco@qilinux.it> 1.5.0-2qilnx
-- enable resume of download
-- remove requirements and provides
-
-* Wed Apr 20 2005 Silvan Calarco <silvan.calarco@qilinux.it> 1.5.0-1qilnx
-- specfile for new jre version (1.5.0)
-- added automatic download and build support (this is a non distributable package)
-
-* Mon Jul 12 2004 Silvan Calarco <silvan.calarco@qilinux.it> 1.4.2-2qilnx
-- create symlinks for browser plugins to /usr/lib/mozilla/plugins
-
-* Mon Oct 13 2003 Silvan Calarco <silvan.calarco@qilinux.it> 1.4.2-1qilnx
-- first build

SRPMS/msttcorefonts/msttcorefonts.spec.in

@@ -13,8 +13,8 @@
 %define name msttcorefonts
 
 Name:          %{name}
-Version:       1.3
-Release:       7@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Summary:       TrueType core fonts for the web
 Group:         Graphical Desktop/Fonts
 Vendor:        @vendor@

SRPMS/skype/skype.spec.in

@@ -1,6 +1,6 @@
 Name:          skype
-Version:       @skypever@
-Release:       2@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       An Internet voice and video communication software
 Group:         Graphical Desktop/Applications/Internet
@@ -13,6 +13,7 @@ License:       Non Distributable
 BuildPrereq:   wget
 BuildPrereq:   /usr/bin/tempfile
 # NOTE: requires the backward compatible version of the libstdc++ library
+Requires:      pulseaudio
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -64,6 +65,37 @@ cp %{S:0} LICENSE
 
 rm -fr ${tmpdir}
 
+# create a v4l1_compat desktop link
+cat > %{buildroot}%{_datadir}/applications/skype-v4l1.desktop << _EOF
+[Desktop Entry]
+Name=Skype (v4l1 webcam compatibility)
+Name[it]=Skype (compatibilità webcam v4l1)
+Comment=Skype Internet Telephony
+Exec=LD_PRELOAD=/usr/lib/libv4l/v4l1compat.so skype
+Icon=skype.png
+Terminal=0
+Type=Application
+Encoding=UTF-8
+Categories=Network;Application;
+MimeType=x-scheme-handler/skype;
+X-KDE-Protocols=skype
+_EOF
+
+cat > %{buildroot}%{_datadir}/applications/skype-v4l2.desktop << _EOF
+[Desktop Entry]
+Name=Skype (v4l2 webcam fixes)
+Name[it]=Skype (correzioni webcam v4l2)
+Comment=Skype Internet Telephony
+Exec=LD_PRELOAD=/usr/lib/libv4l/v4l2convert.so skype
+Icon=skype.png
+Terminal=0
+Type=Application
+Encoding=UTF-8
+Categories=Network;Application;
+MimeType=x-scheme-handler/skype;
+X-KDE-Protocols=skype
+_EOF
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
@@ -71,6 +103,8 @@ rm -fr ${tmpdir}
 %defattr(-,root,root)
 %{_bindir}/skype
 %{_datadir}/applications/skype.desktop
+%{_datadir}/applications/skype-v4l1.desktop
+%{_datadir}/applications/skype-v4l2.desktop
 %{_datadir}/icons/skype.png
 %{_datadir}/pixmaps/skype.png
 %dir %{_datadir}/skype
@@ -80,7 +114,10 @@ rm -fr ${tmpdir}
 %doc LICENSE README
 
 %changelog
-* Thu Sep 10 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2-2mamba
+* Mon Dec 10 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 4.2.0.20-1mamba
+- added v4l1 and v4l2 webcam compatibility desktop entries
+
+* Thu Sep 10 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1.0.47-2mamba
 - specfile fixed for 2.1.0.47
 
 * Wed May 28 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0.0.68-1mamba

SRPMS/spotify/LICENSE

@@ -0,0 +1,188 @@
+Spotify Terms and Conditions of Use
+Effective as from 20 June 2013
+
+Introductions
+Changes to the Agreements
+Enjoying Spotify
+3.1 Subscriptions
+3.2 Codes and other Limited Offers
+3.3 Trials
+Licence and assignment
+Third Party Applications
+User generated content
+Consideration
+User Guidelines
+Copyright infringement
+Technology limitations and modifications
+Brand accounts
+Export control
+Payments, cancellations and cooling off
+Term and termination
+Warranty
+Limitation
+Entire agreement
+Severability
+Choice of law, mandatory arbitration and venue
+Local Country chart
+Hello, and welcome to our Terms and Conditions of Use. This is important and affects your legal rights, so please read them and our Privacy Policy carefully. We hope you’re sitting comfortably. Here we go…
+
+1. Introductions
+Thanks for choosing Spotify (“Spotify”, “we”, “us”, “our”). By using the Spotify service, websites, or software applications (together, the “Spotify Service” or “Service”), including by purchasing or receiving Codes or Limited Offers, you are entering into a binding contract with our local company in your country of residence (your “Local Country”) if applicable or the company listed in this chart. Your agreement with us includes these Terms and Conditions of Use (“Terms”) and our Privacy Policy (together with the Mobile Terms where applicable, the “Agreements”). If you don’t agree with these Terms, then please don’t use the Service.
+
+We’re pleased to make our Service available to you. The Spotify Service includes social and interactive features. Learn more about the Spotify Service here.
+
+In order to use the Spotify Service, you need to (a) be 18 or older, or be 13 or older and have your parent or guardian’s consent to these Terms, (b) have the power to enter a binding contract with us and are not barred from doing so under any applicable laws, and (c) be resident in the Local Country. You also warrant that any registration information that you submit to Spotify is true, accurate and complete, and you agree to keep it that way at all times.
+
+2. Changes to the Agreements
+Occasionally we may, in our discretion, make changes to the Spotify Service and Agreements. When we make changes to the Agreements that we consider material, we’ll notify you through the Service. By continuing to use the Service after those changes are made, you are expressing and acknowledging your acceptance of the changes.
+
+3. Enjoying Spotify
+Here’s some information about all the ways you can enjoy Spotify.
+
+3.1 Subscriptions
+Spotify account holders may access the Spotify Service by any of our several Subscriptions:
+
+Free Service: an ad-based, free-of-charge service;
+Unlimited Service: a subscription fee-based service;
+Premium Service: an ad-free, subscription fee-based service which enables you to listen to music while not connected to the internet, among other features; or
+Mobile Service: via a supported mobile handset.
+The Premium Service permits you to store cached content on up to three (3) personal computers, mobile handsets and/or other relevant devices (collectively “Devices”) while your Premium Service subscription is active. You may not transfer copies of cached content to any other device via any means. By using the Mobile Service, you agree to accept the Mobile Terms and to register for the Service as a mobile subscriber. The Premium Service and the Unlimited Service are hereinafter referred to as “Paid Subscriptions”
+
+3.2 Codes and other Limited Offers
+If you have purchased a code sold by or on behalf of Spotify for access to the Unlimited Service or Premium Service for the time period indicated on your email, card or paper receipt (“Code”), or if you are accessing the service through some other limited offer which you received or purchased from Spotify (“Limited Offer”), these Agreements apply to your access to the Service. Any separate sets of terms and conditions presented to you along with the Code or other Limited Offer also apply to your access to the Service using the Code or Limited Offer.
+
+Subject to any rights you may have under Section 12, Codes are only redeemable in the country where you purchased such Code, not redeemable for cash and may not be returned for a cash refund, exchanged, resold or used to purchase other Codes.
+
+3.3 Trials
+From time to time, we may offer trials of the Premium Service and/or Mobile Service for a specified period without payment (a “Trial”). Spotify reserves the right, in its absolute discretion, to determine your eligibility for a Trial, and to withdraw or to modify a Trial at any time without prior notice and with no liability.
+
+For some Trials, we’ll require you to provide your payment details to start the Trial. At the end of such Trials, we may automatically start to charge you for the Premium Service on the first day following the end of the Trial, on a recurring monthly basis. By providing your payment details in conjunction with the Trial, you agree to this charge. If you do not want this charge, you must change your Subscription to the Free Service through your Spotify account’s settings before the end of the Trial.
+
+4. Licence and assignment
+The Spotify Service and the content provided through it are the property of Spotify or Spotify's licensors, and we grant you a limited, non-exclusive, revocable licence to make personal, non-commercial (except as permitted under Section 11) use of the Spotify Service and to receive the media content made available through the Spotify Service in your Local Country, based on the Subscription or Trial, you have selected (the “Licence”). This Licence shall remain in effect for a period of 20 years unless terminated by you or Spotify.
+
+The Spotify software applications are licensed, not sold, to you, and Spotify retains ownership of all copies of the Spotify software applications even after installation on your Devices. Spotify may assign these Agreements or any part of them without restrictions. You may not assign these Agreements or any part of them, nor transfer or sub-licence your rights under this Licence, to any third party.
+
+All Spotify trademarks, service marks, trade names, logos, domain names, and any other features of the Spotify brand are the sole property of Spotify. This Licence does not grant you any rights to use the Spotify trademarks, service marks, trade names, logos, domain names, or any other features of the Spotify brand, whether for commercial or non-commercial use.
+
+You agree to abide by our User Guidelines and not to use the Spotify Service (including but not limited to its content) in any manner not expressly permitted by the Terms.
+
+Third party software libraries included in the Spotify Service are licensed to you either under these Terms, or under the relevant third party software library’s licence terms as published in the help or settings section of our desktop and mobile client and on our website.
+
+5. Third Party Applications
+The Spotify Service provides a platform for third party applications, websites and services to make available products and services to you (“Third Party Applications”), and your use of these Third Party Applications is subject to their terms of use. You understand and agree that Spotify is not responsible or liable for the behavior, features, or content of any Third Party Application.
+
+6. User generated content
+Spotify users may post, upload and/or contribute (“post”) content to the Service, including pictures, text and playlist compilations (“User Content”). You are solely responsible for any User Content you provide and for any consequences thereof. You represent that you have the right to post any User Content which you post to the Service, and that such User Content, or its use by us as contemplated by this Agreement, does not: (a) violate these Agreements, applicable law, or the intellectual property or publicity rights of others; or (b) imply any affiliation, endorsement, approval or cooperation with you or your User Content by Spotify or any artist, band, label, entity or individual without express written consent from such individual or entity. You grant us a non-exclusive, transferable, sub-licensable, royalty-free, worldwide license to use any User Content that you post on or in connection with Spotify. This license lasts until you terminate your Spotify account, except in the case of User Content that you have published, made public and/or share with others. Aside from the rights specifically granted herein, you retain ownership of all rights, including intellectual property rights, in the User Content that you post to the Spotify Service, except that, where applicable under Local Country law, you agree to waive your right to be identified as the author of any User Content on the Spotify Service and your right to object to derogatory treatment of such User Content.
+
+Spotify does not monitor, review, or edit User Content, but reserves the right to remove or disable access to any User Content for any or no reason, including but not limited to, User Content that, in Spotify’s sole discretion, violates these Agreements. Spotify may take these actions without prior notification to you. Removal or disabling of access to User Content shall be at our sole discretion, and we do not promise to remove or disable access to any specific User Content.
+
+Spotify is not responsible for User Content nor does it endorse any opinion contained in User Content. If you believe that any User Content infringes your intellectual property rights, please click here, or if you believe that any User Content does not comply with the User Guidelines (Section 8 below) or that your rights under applicable law have been otherwise infringed by any User Content, please contact us at legal-feedback@spotify.com.
+
+7. Consideration
+In consideration for the rights granted to you under these Terms, you grant us the right (a) to allow the Spotify Service to use the processor, bandwidth and storage hardware on your Device in order to facilitate the operation of the Service, (b) to provide advertising and other information to you, if you subscribe to the Free Service, and (c) to allow our business partners to do the same.
+
+You grant Spotify a non-exclusive, transferable, sub-licensable, royalty-free, perpetual, worldwide licence to use, reproduce, make available to the public, publish, translate and distribute any User Content that you post on or otherwise provide through the Spotify Service.
+
+These Terms are not intended to grant rights to anyone except you and Spotify, and in no event shall these Terms create any third party beneficiary rights. Any failure by Spotify to enforce these Terms or any provision thereof shall not waive Spotify’s right to do so.
+
+8. User Guidelines
+We’ve established a few ground rules for you to follow when using the Service, to make sure Spotify stays enjoyable for everyone. Please follow these rules and encourage other users to do the same.
+
+Spotify respects intellectual property rights and expects you to do the same. This means, for example, that the following is not permitted: (a) Copying, reproducing, “ripping”, recording, or making available to the public any part of the Spotify Services or content delivered to you via the Spotify Services, or otherwise any making use of the Spotify Service which is not expressly permitted under these Terms; (b) using the Spotify service to import or copy any local files you do not have the legal right to import or copy in this way; (c) reverse-engineering, decompiling, disassembling, modification or creating derivative works based on the Spotify Services or any part thereof; (d) circumventing any technology used by Spotify, its licensors, or any third party to protect content accessible through the Service; (e) renting or leasing of any part of the Services; (f) circumventing of any territorial restrictions applied by Spotify; (g) artificially increasing play count or otherwise manipulating the Services by using a script or other automated process; (h) removing or altering any copyright, trademark or other intellectual property notices contained on or provided through the Spotify Service; (i) providing your password to any other person or using any other person’s user name and password.
+
+Please respect Spotify and other users of the Spotify Service. Don’t engage in any activity on the Service or upload User Content, including registering and/or using a username, which is or includes material that (a) is offensive, abusive, defamatory, pornographic or obscene; (b) is illegal, or intended to promote or commit an illegal act of any kind, including but not limited to, violations of intellectual property rights, privacy rights or proprietary rights of Spotify or a third party; (c) includes personal data of third parties or is intended to solicit such personal data, (d) includes malicious content such as malware, trojan horses or viruses, or otherwise interferes with any user’s access to the Service; (e) is intended or does harass or bully other users; (f) impersonates or misrepresents your affiliation with another user, person or entity, or is otherwise fraudulent, false, deceptive, or misleading; (g) uses automated means to artificially promote content; (h) involves the transmission of unsolicited mass mailing (“spam”), junk mail, chain letter, or similar, including through the Spotify inbox; (i) involves commercial or sales activities, such as advertising, contests, sweepstakes, or pyramid schemes; (j) promotes commercial products or services (except as permitted under Section 11); (k) interferes with the Spotify Service, tampers with or attempts to probe, scan, or test for vulnerabilities in the Service or Spotify’s computer systems or network, or breaches any of Spotify’s security or authentication measures, or (l) conflicts with the Agreement, as determined by Spotify. You agree that Spotify may also reclaim your username for any reason.
+
+Please be thoughtful about what you make public on Spotify. The Spotify Service includes social and interactive features, including the ability to post User Content, share content, and make certain information about you public, as further described in your account settings. Remember that shared or publicly available information may be used and re-shared by other users on Spotify or across the web, so please use Spotify carefully and manage your account settings regularly. Spotify has no responsibility for your choices to make any actions or material public on the Service.
+
+Your password protects your user account, and you are solely responsible for keeping your password confidential and secure. You understand that you are responsible for all use of your username and password on the Service. If your username or password is lost or stolen, or if you believe there has been unauthorized access to your account by third parties, please notify us immediately and change your password as soon as possible.
+
+9. Copyright infringement
+Spotify respects the rights of intellectual property owners. For details on Spotify’s copyright policy, please click here.
+
+10. Technology limitations and modifications
+Spotify will make reasonable efforts to keep the Spotify Service operational. However, certain technical difficulties or maintenance may, from time to time, result in temporary interruptions. Spotify reserves the right, periodically and at any time, to modify or discontinue, temporarily or permanently, functions and features of the Spotify Service, with or without notice, all without liability to you for any interruption, modification, or discontinuation of the Spotify Service or any function or feature thereof. You understand and agree that Spotify has no obligation to maintain, support, upgrade, or update the Service, or to provide all or any specific content through the Service.
+
+11. Brand Accounts
+If you establish a Spotify account on behalf of a company, organization, entity or brand (a “Brand Account”): (a) the terms “you” and “your”, as used throughout the Terms, apply to both you and the Brand (as defined below), as applicable; and (b) the following additional terms apply to your use of the Spotify Service for such purposes (the “Brand Account Terms”). To the extent of a conflict between these Brand Account Terms and the rest of the Terms, these Brand Account Terms shall apply, solely with respect to your Brand Account.
+
+If you open a Brand Account, you represent and warrant that you are authorized to grant all permissions and licenses provided in these Terms and to bind the applicable company, organization, entity or brand (the “Brand”) to these Terms. Spotify has no obligation to promote the Brand Account profile or Brand Playlists (as defined below) and reserves the right to remove or disable access to a Brand’s User Content or profile, consistent with these Terms.
+
+In addition to the User Guidelines set forth in Section 8, the following additional guidelines apply to the Brand’s use of the Spotify Service under a Brand Account:
+
+Brand Playlists.“Brand Playlist” means any song compilation that a Brand creates using the Spotify Service. Unless the Brand has obtained all necessary rights and authorizations from all applicable artists, composers, publishers, labels and other relevant third parties with respect to a Brand Playlist: (a) the Brand Playlist may not be used for commercial or promotional purposes; (b) the name of the Brand Playlist may not include the Brand’s name or the name of any specific entity, brand product, or service; and (c) the Brand Playlists must consist of at least 20 songs and may not include more than one track by a single artist or band.
+Following. Unless the Brand has obtained all necessary rights and authorizations from the applicable user: (a) the Brand may only follow users who first follow the Brand; (b) the Brand may not follow artists; and (c) the Brand may not follow a user in any manner that implies an endorsement or relationship between the Brand and the followed user. Spotify reserves the right to request that a Brand cease following any user(s), for any reason, in Spotify’s sole discretion. In such event, the Brand must cease following such user(s).
+Sharing. Unless the Brand has obtained all necessary rights and authorizations from all applicable artists, composers, labels and other third parties: (a) the Brand may only share (including but not limited to posting and messaging on an automatic or individual basis) Brand Playlists complying with the Brand Playlist requirements above , but not individual songs; and (b) the Brand may not use the Spotify Play Button to embed Brand Playlists on the Brand’s website(s), Facebook page(s) or other assets (but the Brand may use a Spotify link or Spotify Follow button on such assets complying with the Brand Playlist requirements above).
+12. Export control
+Spotify’s products may be subject to U.S. export and reexport control laws and regulations, including the Export Administration Regulations (“EAR”) maintained by the U.S. Department of Commerce, trade and economic sanctions maintained by the Treasury Department’s Office of Foreign Assets Control (“OFAC”), and the International Traffic in Arms Regulations (“ITAR”) maintained by the Department of State. You warrant that you are (1) not located in Cuba, Iran, North Korea, Sudan, or Syria, and (2) are not a denied party as specified in the regulations listed above.
+
+You agree to comply with all applicable export and reexport control laws and regulations, including the EAR, trade and economic sanctions maintained by OFAC, and the ITAR. Specifically, you agree that you shall not – directly or indirectly – sell, export, reexport, transfer, divert, or otherwise dispose of any products, software, or technology (including products derived from or based on such technology) received from Spotify under these Agreements to any destination, entity, or person prohibited by the laws or regulations of the United States, without obtaining prior authorization from the competent government authorities as required by those laws and regulations. This export control clause shall survive termination or cancellation of these Agreements.
+
+13. Payments, cancellations and cooling off
+If you reside in a Local Country which is part of the European Union and have purchased a Paid Subscription or Code online, you have the right to change your mind and receive a full refund within fourteen (14) days of purchase (the “Cooling-off Period”), but only if you have not logged in or otherwise redeemed or started to consume them.
+
+If you have a Paid Subscription, your payment to Spotify will automatically renew at the end of the subscription period, unless you cancel your Paid Subscription through your subscription page before the end of the current subscription period. The cancellation will take effect the day after the last day of the current subscription period, and you will be downgraded to the Free Service. However, if you cancel your payment and/or terminate the Terms after the Cooling-off Period is over (where applicable), and/or before the end of the subscription period, we will not refund any subscription fees already paid to us.
+
+Spotify may change the price for the Paid Subscriptions from time to time, and will communicate any price changes to you. Price changes for Paid Subscriptions will take effect at the start of the next subscription period following the date of the price change. By continuing to use the Spotify Service after the price change takes effect, you accept the new price.
+
+14. Term and termination
+These Terms will continue to apply to you until terminated by either you or Spotify. Spotify may terminate the Terms or suspend your access to the Spotify Service at any time, including in the event of your actual or suspected unauthorised use of the Spotify Service or non-compliance with the Terms. If you or Spotify terminate the Terms, or if Spotify suspends your access to the Spotify Service, you agree that Spotify shall have no liability or responsibility to you and Spotify will not refund any amounts that you have already paid, to the fullest extent permitted under applicable law. To learn how to terminate your Spotify account, please go here.
+
+15. Warranty
+We endeavor to provide the best service we can, but you understand and agree that THE SPOTIFY SERVICE IS PROVIDED “AS IS”, WITHOUT EXPRESS OR IMPLIED WARRANTY OR CONDITION OF ANY KIND. YOU USE THE SPOTIFY SERVICE AT YOUR OWN RISK. SPOTIFY DISCLAIMS ANY WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.
+
+In addition, Spotify does not warrant, endorse, guarantee or assume responsibility for any Third Party Applications, Third Party Application content, User Content, or any other product or service advertised or offered by a third party on or through the Spotify Service or any hyperlinked website, or featured in any banner or other advertising. You understand and agree that Spotify is not responsible or liable for any transaction between you and third-party providers of Third Party Applications or products or services advertised on or through the Spotify Service. As with any purchase of a product or service through any medium or in any environment, you should use your judgment and exercise caution where appropriate. No advice or information whether oral or in writing obtained by you from Spotify shall create any warranty on behalf of Spotify in this regard. Some aspects of this section may not apply in some jurisdictions.
+
+16. Limitation
+You agree that, to the extent permitted by applicable law, your sole and exclusive remedy for any problems or dissatisfaction with the Spotify Service, the Third Party Applications or the Third Party Application content is to uninstall any Spotify software and to stop using the Spotify Service, the Third Party Applications or the Third Party Application content.
+
+TO THE FULLEST EXTENT PERMITTED BY LAW, IN NO EVENT WILL SPOTIFY, ITS OFFICERS, SHAREHOLDERS, EMPLOYEES, AGENTS, DIRECTORS, SUBSIDIARIES, AFFILIATES, SUCCESSORS, ASSIGNS, SUPPLIERS OR LICENSORS BE LIABLE FOR (i) ANY INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, EXEMPLARY OR CONSEQUENTIAL (INCLUDING LOSS OF USE, DATA, BUSINESS, OR PROFITS) DAMAGES, ARISING OUT OF THE USE OR INABILITY TO USE THE SPOTIFY SERVICE, THIRD PARTY APPLICATIONS OR THIRD PARTY APPLICATION CONTENT, REGARDLESS OF LEGAL THEORY, WITHOUT REGARD TO WHETHER SPOTIFY HAS BEEN WARNED OF THE POSSIBILITY OF THOSE DAMAGES, AND EVEN IF A REMEDY FAILS OF ITS ESSENTIAL PURPOSE; (ii) AGGREGATE LIABILITY FOR ALL CLAIMS RELATING TO THE SPOTIFY SERVICE, THIRD PARTY APPLICATIONS OR THIRD PARTY APPLICATION CONTENT MORE THAN THE AMOUNTS PAID BY YOU TO SPOTIFY DURING THE PRIOR THREE MONTHS IN QUESTION.
+
+Nothing in these Agreements removes or limits Spotify’s liability for fraud, fraudulent misrepresentation, death or personal injury caused by its negligence. Some aspects of this section may not apply in some jurisdictions.
+
+17. Entire agreement
+These Agreements constitute all the terms and conditions agreed upon between you and Spotify and supersede any prior agreements in relation to the subject matter of these Agreements, whether written or oral. Any additional or different terms or conditions in relation to the subject matter of the Agreements in any written or oral communication from you to Spotify are void. You represent that you have not accepted the Agreements in reliance on any oral or written representations made by Spotify that are not contained in the Agreements.
+
+Please note, however, that other aspects of your use of the Spotify Service may be governed by additional agreements. That could include, for example, access to the Spotify Community for customer support, access to the Spotify Service as a result of a gift card, or free or discounted Trials. You will agree to separate terms and conditions in those circumstances, which are listed in full here. Those terms and conditions shall govern only with regard to the aspect of the Service to which they apply, and are distinct from and supplemental to these Agreements, and do not supersede these Agreements. To the extent that there is any conflict between those agreements and these Agreements, these Agreements shall control, except as otherwise provided in these Terms.
+
+Occasionally we may offer you the chance to participate in sweepstakes, contests, and surveys (“Special Promotions”) through the Service. Special Promotions may be governed by terms and conditions that are separate from these Terms. If the provisions of a Special Promotion’s terms and conditions conflict with these Terms, those separate terms and conditions shall prevail.
+
+18. Severability
+Should any provision of the Terms be held invalid or unenforceable for any reason or to any extent, such invalidity or enforceability shall not in any manner affect or render invalid or unenforceable the remaining provisions of the Terms, and the application of that provision shall be enforced to the extent permitted by law.
+
+19. Choice of law, mandatory arbitration and venue
+Unless otherwise required by a mandatory law of a member state of the European Union or any other jurisdiction, these Agreements are subject to the law of the State of California, United States, without regard to choice or conflicts of law principles. Further, you and Spotify agree to the exclusive jurisdiction of the state and federal courts in San Francisco County, California or New York, New York to resolve any dispute, claim or controversy that arises in connection with these Agreements.
+
+If you are a United States user, the following mandatory arbitration provisions also apply to you:
+
+You and Spotify agree that any dispute, claim or controversy arising out of or relating in any way to the Spotify Service or your use thereof, including our Agreements, shall be determined by mandatory binding arbitration. You agree that the U.S. Federal Arbitration Act governs the interpretation and enforcement of this provision, and that you and Spotify are each waiving the right to a trial by jury and the right to participate in a class or multi-party action. This arbitration provision shall survive termination of these Agreements and the termination of your Spotify account. The arbitration will be governed by the Commercial Arbitration Rules and the Supplementary Procedures for Consumer Related Disputes of the American Arbitration Association (the “AAA Rules”), as modified by these Agreements, and as administered by the AAA. You and Spotify agree that these Agreements involve interstate commerce and are subject to the Federal Arbitration Act.
+You and Spotify agree that (a) any claims seeking to enforce, protect, or determine the validity or ownership of any intellectual property rights, and (b) any claims related to allegations of theft, piracy or unauthorized use of the Spotify Service are NOT subject to mandatory arbitration. Instead, you and Spotify agree that these claims (including but not limited to claims for injunctive or equitable relief) shall be exclusively decided by courts of competent jurisdiction in San Francisco County, California or New York, New York, and that applicable California and/or Federal law shall govern, without regard to choice of law principles.
+YOU AND SPOTIFY AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY, AND NOT AS A CLASS MEMBER OR IN ANY REPRESENTATIVE CAPACITY OR PROCEEDING. Further, no arbitrator shall consolidate any other person’s claims with your claims, and may not otherwise preside over any form of a multi-party or class proceeding. If this specific provision is found to be unenforceable in any way, then the entirety of this arbitration section shall be null and void. The arbitrator may not award declaratory or injunctive relief.
+Any arbitration must be commenced by filing a demand for arbitration with the AAA within ONE (1) YEAR after the date the party asserting the claim first knows or reasonably should know of the act, omission or default giving rise to the claim; and there shall be no right to any remedy for any claim not asserted within that time period. If applicable law prohibits a one-year limitations period for asserting claims, any claim must be asserted within the shortest time period permitted by applicable law. Your arbitration fees and your share of arbitrator compensation will be limited to those fees set forth in the AAA's Consumer Rules with the remainder paid by Spotify. Any arbitration costs or fees deemed “excessive” will be paid by Spotify.
+20. Local Country chart
+This chart details the Spotify entity with which you are contracting by accepting these Agreements, depending on your Local Country of residence.
+
+Local Country of Residence	Spotify entity
+Australia or New Zealand	Spotify Australia PTY. Ltd., registration number ACN 154 200 941
+Austria	Spotify Austria GmbH, registration number FN 354148 g
+Belgium	Spotify NV, registration number 0841.023.949
+Denmark	Spotify Denmark ApS, registration number 33785348
+Finland	Spotify Finland Oy, registration number 2388862-0
+France	Spotify France SAS, registration number 51193072900013
+Germany	Spotify GmbH, registration number HRB 114 530 B
+Liechtenstein, Luxembourg, Monaco and Andorra	Spotify AB, registration number 556703-7485
+Netherlands	Spotify Netherlands B.V., registration number 34388788
+Norway	Spotify Norway AS, registration number 994 445 820
+Spain	Spotify Spain S.L, registration number B85346294
+Sweden	Spotify Sweden AB, registration number 556786-5729
+Switzerland	Spotify Switzerland AG, registration number CH-020.3.037.242-8
+United Kingdom or Ireland	Spotify Limited, registration number 06436047
+USA	Spotify USA Inc, registered in Delaware with registration number 4664052
+Thank you for reading our Terms. We hope you enjoy Spotify.
+
+Copyright © 2012 Spotify AB. All rights reserved.
+
+Spotify USA Inc., 45 W. 18th Street,
+7th Floor
+New York, NY 10011
+USA

SRPMS/spotify/spotify.spec.in

@@ -0,0 +1,88 @@
+#% define spotify_make_ver 20130831git
+Name:          spotify
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
+Summary:       Listen to music using Spotify
+Group:         Graphical Desktop/Applications/Multimedia
+Vendor:        @vendor@
+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.git/master/spotify-make-%{version}.zip
+Source1:       LICENSE
+License:       Not distributable
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+Listen to music using Spotify.
+
+%prep
+%setup -q -n spotify-make-master
+
+%build
+./configure \
+   --prefix=/opt/spotify \
+   --mandir=%{_mandir}
+
+make download
+
+%install
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+%makeinstall
+
+install -d -m0755 %{buildroot}%{_datadir}
+mv %{buildroot}/opt/spotify/share/applications %{buildroot}%{_datadir}
+mv %{buildroot}/opt/spotify/share/icons %{buildroot}%{_datadir}
+
+install -d -m0755 %{buildroot}%{_bindir}
+ln -s /opt/spotify/bin/spotify %{buildroot}%{_bindir}/spotify
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+
+%pre
+if [ $1 -ge 1 ]; then
+   rm -f /opt/spotify/share/spotify-client/Data/locales
+   rm -f /opt/spotify/share/spotify-client/Data/resources.zip
+   rm -f /opt/spotify/lib/spotify-client/Data
+fi
+:
+
+%post
+if [ $1 -ge 1 ]; then
+   gtk-update-icon-cache --ignore-theme-index %{_datadir}/icons/hicolor
+   desktop-file-validate %{_datadir}/applications/spotify.desktop
+   update-desktop-database  %{_datadir}/applications
+fi
+:
+
+%postun
+if [ $1 -eq 0 ]; then
+   gtk-update-icon-cache --ignore-theme-index %{_datadir}/icons/hicolor
+   desktop-file-validate %{_datadir}/applications/spotify.desktop
+   update-desktop-database  %{_datadir}/applications
+fi
+:
+
+%files
+%defattr(-,root,root)
+%{_bindir}/spotify
+%{_datadir}/applications/spotify.desktop
+%{_datadir}/icons/hicolor/*/apps/spotify-client.png
+%dir /opt/spotify
+%dir /opt/spotify/bin
+/opt/spotify/bin/spotify
+%dir /opt/spotify/lib
+%dir /opt/spotify/lib/spotify-client
+/opt/spotify/lib/spotify-client/*
+%dir /opt/spotify/share
+%dir /opt/spotify/share/spotify-client/
+/opt/spotify/share/spotify-client/*
+%{_mandir}/man1/spotify.1.gz
+
+%changelog
+* Sat Aug 31 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 0.9.1.55.gbdd3b79.203-1mamba
+- package created by silvan using the webbuild interface

SRPMS/sun-java7/sun-java7.spec.in

@@ -8,7 +8,7 @@
 %define        javaver           %{major}.%{minor}
 %define        jppname           java-%{javaver}-%{origin}
 %define        javaws_ver        %{javaver}
-%define        toplevel_dir      jdk%{javaver}_06
+%define        toplevel_dir      jdk%{javaver}_%{MINOR}
 %define        distversion       %{version}
 %define        label             -%{name}
 %define        jdklnk            jdk7-%{origin}
@@ -22,8 +22,8 @@
 %define        cgibindir         %{_var}/www/cgi-bin
 
 Name:          sun-java7
-Version:       @sunjava7ver@
-Release:       2@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       Sun Java Developer's Kit
 Group:         System/Libraries/Java
@@ -53,7 +53,7 @@ Sun Java Developer's Kit.
 %package runtime
 Summary:       Sun Java Platform Runtime Environment
 Group:         System/Libraries/Java
-Obsoletes:     j2re
+#Obsoletes:     j2re
 Provides:      j2re = %{version}
 Provides:      jre = %{version}
 
@@ -68,20 +68,20 @@ Sun Java Platform Runtime Environment.
 #echo yes | MORE=10000
 %ifarch %{ix86}
 wget -nv --tries=2 --no-cookies --header \
-   "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-i586.tar.gz
+   "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b13/jdk-%{version}-linux-i586.tar.gz
 tar xf jdk-%{version}-linux-i586.tar.gz
 %endif
 %ifarch x86_64
 wget -nv --tries=2 --no-cookies --header \
-   "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-x64.tar.gz
+   "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b13/jdk-%{version}-linux-x64.tar.gz
 tar xf jdk-%{version}-linux-x64.tar.gz
 %endif
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
-   "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-arm-sfp.tar.gz
+   "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b13/jdk-%{version}-linux-arm-vfp-sflt.tar.gz
 tar xf jdk-%{version}-linux-arm-sfp.tar.gz
 %endif
 
@@ -302,6 +302,9 @@ touch %{buildroot}%{_jvmdir}/%{jredir}/.systemPrefs/.systemRootModFile
 #   chrpath --list $file && chrpath --delete $file || :
 #done
 
+# Remove requirements for old ffmpeg libraries
+rm -f %{buildroot}%{_jvmdir}/%{jredir}/lib/*/fxavcodecplugin-52.so
+
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 
@@ -451,40 +454,41 @@ fi
 %{_jvmdir}/%{jdkdir}/src.zip
 %dir %{_javadir}-%{javaver}
 %dir %{_jnidir}-%{javaver}
-%{_mandir}/man1/appletviewer-sun7.1.gz
-%{_mandir}/man1/apt-sun7.1.gz
-%{_mandir}/man1/extcheck-sun7.1.gz
-%{_mandir}/man1/idlj-sun7.1.gz
-%{_mandir}/man1/jar-sun7.1.gz
-%{_mandir}/man1/jarsigner-sun7.1.gz
-%{_mandir}/man1/javac-sun7.1.gz
-%{_mandir}/man1/javadoc-sun7.1.gz
+%{_mandir}/man1/appletviewer-sun7.1*
+%{_mandir}/man1/apt-sun7.1*
+%{_mandir}/man1/extcheck-sun7.1*
+%{_mandir}/man1/idlj-sun7.1*
+%{_mandir}/man1/jar-sun7.1*
+%{_mandir}/man1/jarsigner-sun7.1*
+%{_mandir}/man1/javac-sun7.1*
+%{_mandir}/man1/javadoc-sun7.1*
 %ifnarch arm
-%{_mandir}/man1/javafxpackager-sun7.1.gz
+%{_mandir}/man1/javafxpackager-sun7.1*
 %endif
-%{_mandir}/man1/javah-sun7.1.gz
-%{_mandir}/man1/javap-sun7.1.gz
-%{_mandir}/man1/jcmd-sun7.1.gz
-%{_mandir}/man1/jconsole-sun7.1.gz
-%{_mandir}/man1/jdb-sun7.1.gz
-%{_mandir}/man1/jhat-sun7.1.gz
-%{_mandir}/man1/jinfo-sun7.1.gz
-%{_mandir}/man1/jmap-sun7.1.gz
-%{_mandir}/man1/jps-sun7.1.gz
-%{_mandir}/man1/jrunscript-sun7.1.gz
-%{_mandir}/man1/jsadebugd-sun7.1.gz
-%{_mandir}/man1/jstack-sun7.1.gz
-%{_mandir}/man1/jstat-sun7.1.gz
-%{_mandir}/man1/jstatd-sun7.1.gz
-%{_mandir}/man1/jvisualvm-sun7.1.gz
-%{_mandir}/man1/native2ascii-sun7.1.gz
-%{_mandir}/man1/policytool-sun7.1.gz
-%{_mandir}/man1/rmic-sun7.1.gz
-%{_mandir}/man1/schemagen-sun7.1.gz
-%{_mandir}/man1/serialver-sun7.1.gz
-%{_mandir}/man1/wsgen-sun7.1.gz
-%{_mandir}/man1/wsimport-sun7.1.gz
-%{_mandir}/man1/xjc-sun7.1.gz
+%{_mandir}/man1/javah-sun7.1*
+%{_mandir}/man1/javap-sun7.1*
+%{_mandir}/man1/jcmd-sun7.1*
+%{_mandir}/man1/jconsole-sun7.1*
+%{_mandir}/man1/jdb-sun7.1*
+%{_mandir}/man1/jhat-sun7.1*
+%{_mandir}/man1/jinfo-sun7.1*
+%{_mandir}/man1/jmap-sun7.1*
+%{_mandir}/man1/jmc-sun7.1*
+%{_mandir}/man1/jps-sun7.1*
+%{_mandir}/man1/jrunscript-sun7.1*
+%{_mandir}/man1/jsadebugd-sun7.1*
+%{_mandir}/man1/jstack-sun7.1*
+%{_mandir}/man1/jstat-sun7.1*
+%{_mandir}/man1/jstatd-sun7.1*
+%{_mandir}/man1/jvisualvm-sun7.1*
+%{_mandir}/man1/native2ascii-sun7.1*
+%{_mandir}/man1/policytool-sun7.1*
+%{_mandir}/man1/rmic-sun7.1*
+%{_mandir}/man1/schemagen-sun7.1*
+%{_mandir}/man1/serialver-sun7.1*
+%{_mandir}/man1/wsgen-sun7.1*
+%{_mandir}/man1/wsimport-sun7.1*
+%{_mandir}/man1/xjc-sun7.1*
 %doc %{toplevel_dir}/COPYRIGHT %{toplevel_dir}/LICENSE
 %doc %{toplevel_dir}/THIRDPARTYLICENSEREADME.txt
 # %{toplevel_dir}/README*
@@ -514,7 +518,7 @@ fi
 %{_jvmdir}/%{jredir}/lib/i386
 %endif
 %ifarch x86_64
-%{_jvmdir}/%{jredir}/lib/x86_64
+%{_jvmdir}/%{jredir}/lib/amd64
 %endif
 %ifarch arm
 %{_jvmdir}/%{jredir}/lib/arm
@@ -527,14 +531,17 @@ fi
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %ifnarch arm
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javafx.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javaws.policy
 %endif
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklist
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/trusted.libraries
 %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
 %ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
+%dir %{_jvmdir}/%{jredir}/lib/jfr
+%{_jvmdir}/%{jredir}/lib/jfr/*
 %{_jvmdir}/%{jredir}/lib/currency.data
-%{_jvmdir}/%{jredir}/lib/servicetag
+#%{_jvmdir}/%{jredir}/lib/servicetag
 %{_jvmdir}/%{jredir}/.systemPrefs
 %{_jvmdir}/%{jredir}/lib/zi
 
@@ -578,21 +585,34 @@ fi
 %dir %{_datadir}/fonts/ttf/j2se-sun
 %{_datadir}/fonts/ttf/j2se-sun/*.ttf
 
-%{_mandir}/man1/java-sun7.1.gz
-%{_mandir}/man1/javaws-sun7.1.gz
-%{_mandir}/man1/keytool-sun7.1.gz
-%{_mandir}/man1/orbd-sun7.1.gz
-%{_mandir}/man1/pack200-sun7.1.gz
-%{_mandir}/man1/rmid-sun7.1.gz
-%{_mandir}/man1/rmiregistry-sun7.1.gz
-%{_mandir}/man1/servertool-sun7.1.gz
-%{_mandir}/man1/tnameserv-sun7.1.gz
-%{_mandir}/man1/unpack200-sun7.1.gz
+%{_mandir}/man1/java-sun7.1*
+%{_mandir}/man1/javaws-sun7.1*
+%{_mandir}/man1/keytool-sun7.1*
+%{_mandir}/man1/orbd-sun7.1*
+%{_mandir}/man1/pack200-sun7.1*
+%{_mandir}/man1/rmid-sun7.1*
+%{_mandir}/man1/rmiregistry-sun7.1*
+%{_mandir}/man1/servertool-sun7.1*
+%{_mandir}/man1/tnameserv-sun7.1*
+%{_mandir}/man1/unpack200-sun7.1*
 %doc %{toplevel_dir}/jre/COPYRIGHT %{toplevel_dir}/jre/LICENSE
 %doc %{toplevel_dir}/jre/THIRDPARTYLICENSEREADME.txt
 #  %{toplevel_dir}/jre/README %{toplevel_dir}/jre/Welcome.html
 
 %changelog
+* Fri Mar 26 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 7u51-2mamba
+- update wget download string (see https://ivan-site.com/2012/05/download-oracle-java-jre-jdk-using-a-script/)
+- dont' install fxavcodecplugin-52.so to remove dependencies on old libav library; fxavcodecplugin-53.so is provided requiring ffmpeg0
+
+* Fri Jan 17 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 7u51-1mamba
+- update to 7u51
+
+* Sun Nov 03 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 7u45-1mamba
+- update to 7u45
+
+* Wed Apr 10 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 7u17-1mamba
+- update to 7u17
+
 * Sun Aug 19 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 7u6-2mamba
 - rename to sun-java7
 

SRPMS/virtualbox-extension-pack/distroutils.sysconfig.in

@@ -1,7 +1,7 @@
 ## VirtualBox Extension Pack
 
 # package name (do not modify unless you know what you're doing)
-VIRTUALBOX_EXTENSION_PACK_PCK=Oracle_VM_VirtualBox_Extension_Pack-@virtualboxextensionpackver@.vbox-extpack
+VIRTUALBOX_EXTENSION_PACK_PCK=Oracle_VM_VirtualBox_Extension_Pack-${SRPMVERSION["virtualbox-extension-pack"]}.vbox-extpack
 
 # package URL (do not modify unless you know what you're doing)
-VIRTUALBOX_EXTENSION_PACK_URL=http://download.virtualbox.org/virtualbox/@virtualboxextensionpackver@/
+VIRTUALBOX_EXTENSION_PACK_URL=http://download.virtualbox.org/virtualbox/${SRPMVERSION["virtualbox-extension-pack"]}/

SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in

@@ -1,8 +1,8 @@
 %define pck_majver %(echo %version | cut -d. -f1-3)
 %define pck_minver %(echo %version | cut -d. -f4)
 Name:          virtualbox-extension-pack
-Version:       @virtualboxextensionpackver@
-Release:       1@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       VirtualBox Extension Pack
 Group:         Applications/Emulators
@@ -22,6 +22,7 @@ VirtualBox Extension Pack.
 %setup -c -n %{name}-%{version} -T
 
 [ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+declare -A SRPMVERSION SRPMRELEASE
 . /etc/sysconfig/@sysconfigfile@
 
 [ "${VIRTUALBOX_EXTENSION_PACK_PCK}" ] || exit 1
@@ -36,6 +37,7 @@ wget -nv --timeout=10 --tries=2 \
 
 %install
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+declare -A SRPMVERSION SRPMRELEASE
 . /etc/sysconfig/@sysconfigfile@
 
 install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}/opt/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}

SRPMS/win32codecs/win32codecs.spec.in

@@ -12,8 +12,8 @@
 %define alt_url10 ftp://ftp10.mplayerhq.hu/MPlayer/releases/codecs/
 
 Name:          win32codecs
-Version:       @win32codecsver@
-Release:       1@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Summary:       Win32 native dll codecs
 Group:         System/Multimedia
 Vendor:        @vendor@

SRPMSVERSIONS

@@ -1,5 +1,24 @@
-FLASHPLUGIN_VERSION=11.2.202.251
-WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=4.0.0.8
-VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u6
+# b43-firmware
+SRPMVERSION["b43-firmware"]=4.150.10.5
+SRPMRELEASE["b43-firmware"]=1mamba
+# flashplugin
+SRPMVERSION["flashplugin"]=11.2.202.394
+SRPMRELEASE["flashplugin"]=1mamba
+# msttcorefonts
+SRPMVERSION["msttcorefonts"]=1.3
+SRPMRELEASE["msttcorefonts"]=7mamba
+# skype
+SRPMVERSION["skype"]=4.3.0.37
+SRPMRELEASE["skype"]=2mamba
+# spotify
+SRPMVERSION["spotify"]=20140117
+SRPMRELEASE["spotify"]=1mamba
+# sun-java7
+SRPMVERSION["sun-java7"]=7u51
+SRPMRELEASE["sun-java7"]=2mamba
+# virtualbox-extension-pack
+SRPMVERSION["virtualbox-extension-pack"]=4.3.12
+SRPMRELEASE["virtualbox-extension-pack"]=1mamba
+# win32codecs
+SRPMVERSION["win32codecs"]=20110131
+SRPMRELEASE["win32codecs"]=1mamba

SRPMSVERSIONS.arm

@@ -0,0 +1,2 @@
+SRPMVERSION["sun-java7"]=7u51
+SRPMRELEASE["sun-java7"]=2mamba

VERSION

@@ -1 +1 @@
-VERSION = 2.3.14
+VERSION = 2.4.6

bootrecover/bootrecover.kmdr

@@ -457,28 +457,6 @@ This tool is also useful before the installation of a third party boot manager i
                     <string></string>
                 </stringlist>
             </property>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label24</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>30</y>
-                        <width>540</width>
-                        <height>40</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Please, select the openmamba system partition where you want the boot loader to be installed from.</string>
-                </property>
-                <property name="textFormat">
-                    <enum>RichText</enum>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignTop</set>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label3</cstring>
@@ -503,27 +481,6 @@ This tool is also useful before the installation of a third party boot manager i
                     <set>AlignVCenter|AlignLeft</set>
                 </property>
             </widget>
-            <widget class="ListBox">
-                <property name="name">
-                    <cstring>devicesbox</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>90</y>
-                        <width>540</width>
-                        <height>230</height>
-                    </rect>
-                </property>
-                <property name="populationText">
-                    <string></string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>showdevice</cstring>
@@ -545,6 +502,49 @@ This tool is also useful before the installation of a third party boot manager i
                     </stringlist>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label24</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>30</y>
+                        <width>540</width>
+                        <height>40</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Please, select the openmamba system partition where you want the boot loader to be installed from.</string>
+                </property>
+                <property name="textFormat">
+                    <enum>RichText</enum>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignTop</set>
+                </property>
+            </widget>
+            <widget class="ListBox">
+                <property name="name">
+                    <cstring>devicesbox</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>90</y>
+                        <width>540</width>
+                        <height>230</height>
+                    </rect>
+                </property>
+                <property name="populationText">
+                    <string></string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
         </widget>
         <widget class="ScriptObject">
             <property name="name">
@@ -646,6 +646,9 @@ done
 function get_udisks_key() {
    LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
 }
+function get_udisks_key_last() {
+   LANG=C udisks --show-info $1 | grep " $2:" | tail -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
 @if (@devicesbox.currentItem &gt;= 0)
    currdev=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
    @showdevice.setText(@devicesbox.item(@devicesbox.currentItem))
@@ -661,12 +664,18 @@ function get_udisks_key() {
 
    for device in $devices; do
       native_path=`get_udisks_key $device native-path`
-      [ -e $native_path/partition ] &amp;&amp; continue
-      is_system_internal=`get_udisks_key $device "system internal"`
-      partscheme=`get_udisks_key $device scheme`
-      if [ "$is_system_internal" == "1" -o "@removablebox.checked" == "1" ]; then
-         [ "$partscheme" == "mbr" ] &amp;&amp; \
-            dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
+      if [ -e $native_path/partition ]; then
+          partition_label=`get_udisks_key_last $device label`
+          if [ "${partition_label:0:3}" = "EFI" ]; then
+             dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (@i18n("EFI system partition"))" 0
+          fi
+      else
+         is_system_internal=`get_udisks_key $device "system internal"`
+         partscheme=`get_udisks_key $device scheme`
+         if [ "$is_system_internal" == "1" -o "@removablebox.checked" == "1" ]; then
+            [ "$partscheme" == "mbr" ] &amp;&amp; \
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
+         fi
       fi
    done
    dcop @dcopid KommanderIf "setCurrentItem(int)" 0
@@ -709,6 +718,44 @@ function get_udisks_key() {
                 <set>AlignCenter</set>
             </property>
         </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>setBootableCheckbox</cstring>
+            </property>
+            <property name="enabled">
+                <bool>false</bool>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>530</x>
+                    <y>0</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@BackBox.setChecked(true)
+@NextBox.setChecked(true)
+@execBegin
+mbrstring=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",1)
+mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+mbrpart=${mbrdevice:3:2}
+if [ "$mbrpart" -a "${mbrstring/EFI}" = "${mbrstring}" ]; then
+   if [ $mbrpart -le 4 ]; then
+      dcop @dcopid KommanderIf setEnabled bootableBox true
+   else
+      dcop @dcopid KommanderIf setEnabled bootableBox false
+      dcop @dcopid KommanderIf setChecked bootableBox false
+   fi
+else
+   dcop @dcopid KommanderIf setEnabled bootableBox false
+fi
+@execEnd
+</string>
+                </stringlist>
+            </property>
+        </widget>
         <widget class="ButtonGroup">
             <property name="name">
                 <cstring>BootloaderBox</cstring>
@@ -732,6 +779,25 @@ function get_udisks_key() {
             <property name="title">
                 <string>Bootloader configuration</string>
             </property>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label29_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>20</y>
+                        <width>531</width>
+                        <height>40</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Please select where you want to install the boot manager.</string>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignVCenter</set>
+                </property>
+            </widget>
             <widget class="QLayoutWidget">
                 <property name="name">
                     <cstring>Layout5_2</cstring>
@@ -739,7 +805,7 @@ function get_udisks_key() {
                 <property name="geometry">
                     <rect>
                         <x>10</x>
-                        <y>330</y>
+                        <y>60</y>
                         <width>530</width>
                         <height>26</height>
                     </rect>
@@ -811,181 +877,6 @@ function get_udisks_key() {
                     </widget>
                 </hbox>
             </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label3_2_2_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>70</y>
-                        <width>290</width>
-                        <height>24</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Please select the boot menu options:</string>
-                </property>
-            </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label28</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>30</y>
-                        <width>540</width>
-                        <height>40</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Below is a list of other operating systems found on this computer, you may configure them to appear as a choice when the computer starts.</string>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignTop</set>
-                </property>
-            </widget>
-            <widget class="ListBox">
-                <property name="name">
-                    <cstring>chainloadbox</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>100</y>
-                        <width>540</width>
-                        <height>170</height>
-                    </rect>
-                </property>
-                <property name="selectionMode">
-                    <enum>Multi</enum>
-                </property>
-            </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label29_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>280</y>
-                        <width>531</width>
-                        <height>40</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Please select where you want to install the boot manager.</string>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignVCenter</set>
-                </property>
-            </widget>
-            <widget class="ScriptObject">
-                <property name="name">
-                    <cstring>setBootableCheckbox</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>false</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>520</x>
-                        <y>70</y>
-                        <width>32</width>
-                        <height>32</height>
-                    </rect>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string>@execBegin
-mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
-mbrpart=${mbrdevice:3:2}
-if [ "$mbrpart" ]; then
-   if [ $mbrpart -le 4 ]; then
-      dcop @dcopid KommanderIf setEnabled bootableBox true
-   else
-      dcop @dcopid KommanderIf setEnabled bootableBox false
-      dcop @dcopid KommanderIf setChecked bootableBox false
-   fi
-else
-   dcop @dcopid KommanderIf setEnabled bootableBox false
-fi
-@execEnd
-</string>
-                    </stringlist>
-                </property>
-            </widget>
-        </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>scanbootloader</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>10</x>
-                    <y>10</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@BackBox.setChecked(true)
-@NextBox.setChecked(true)
-@chainloadbox.clear
-@setBootableCheckbox.execute()
-@execBegin
-function get_udisks_key() {
-   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
-}
-installdevice=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
-devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n -r`
-partlabel=
-
-for device in $devices; do
-   native_path=`get_udisks_key $device native-path`
-   [ -e $native_path/partition ] || continue
-   is_system_internal=`get_udisks_key $device "system internal"`
-   volsize=`get_udisks_key $device size`
-   volsize=`expr $volsize / 1024 / 1024`
-   [ $volsize = 0 ] &amp;&amp; continue
-   volname=`get_udisks_key $device label`
-   [ "$volname" ] || volname="unnamed"
-   parttype=`get_udisks_key $device usage`
-   [ "$parttype" ] || parttype="unknown"
-   partscheme=`get_udisks_key $device scheme`
-   [ "$partscheme" ] || partscheme="unknown"
-   fstype=`get_udisks_key $device type`
-   [ "$fstype" ] || fstype="unformatted"
-   add_info=""
-   [ "$is_system_internal" = "1" ] || {
-      add_info=",removable"
-      [ @removablebox.checked == 1 ] || continue
-   }
-
-   if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
-      partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
-      case "$fstype" in
-         swap|iso9660|unformatted) ;;
-         ext2|ext3|ext4|reiserfs|reiser4|unformatted) ;;
-         *) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})" 0
-	    dcop @dcopid KommanderIf "setSelection" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})"
-         ;;
-      esac
-   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
-      case "$fstype" in
-         swap|iso9660|unformatted) ;;
-         ext2|ext3|ext4|reiserfs|reiser4) ;;
-         *) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})" 0
-	    dcop @dcopid KommanderIf "setSelection" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})"
-         ;;
-      esac
-   fi
-done
-@execEnd</string>
-                </stringlist>
-            </property>
         </widget>
     </widget>
     <widget class="QWidget">
@@ -1062,6 +953,25 @@ done
                 </stringlist>
             </property>
         </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>ScriptObject7</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>20</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
+</string>
+                </stringlist>
+            </property>
+        </widget>
         <widget class="ScriptObject">
             <property name="name">
                 <cstring>launchinstall</cstring>
@@ -1086,11 +996,17 @@ cat &gt; $conffile &lt;&lt; _EOF
 # created by openmamba bootrecover wizard
 #
 _EOF
+
 @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), back,false)
 
 installdevice=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
 mountpoint=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",1)
-mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+mbrstring="@mbrbox.item(@mbrbox.currentItem)"
+if [ "${mbrstring/EFI}" != "${mbrstring}" ]; then
+   efidevice=/dev/@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+else
+   mbrdevice=/dev/@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+fi
 
 IFS=$'\n' 
 CHAINLOAD_SELECTED=(`dcop @dcopid KommanderIf selection chainloadbox`)
@@ -1102,7 +1018,8 @@ IFS=$' \t\n'
 cat &gt;&gt;$conffile &lt;&lt; _EOF
 INSTALL_DEVICE='/dev/$installdevice'
 INSTALL_MOUNTPOINT='$mountpoint'
-INSTALL_BOOTLOADER_DEVICE='/dev/$mbrdevice'
+INSTALL_BOOTLOADER_DEVICE='$mbrdevice'
+INSTALL_BOOTLOADER_DEVICE_EFI='$efidevice'
 INSTALL_BOOTLOADER_DEVICE_SETBOOTABLE=@bootableBox.checked
 INSTALL_BOOTLOADER_CHAINLOAD=($chainloaddevices)
 _EOF
@@ -1127,25 +1044,6 @@ _EOF
 @endif
 
 @BackBox.setChecked(false)
-</string>
-                </stringlist>
-            </property>
-        </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>ScriptObject7</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>20</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
 </string>
                 </stringlist>
             </property>
@@ -1185,12 +1083,6 @@ _EOF
         <receiver>setBootableCheckbox</receiver>
         <slot>execute()</slot>
     </connection>
-    <connection>
-        <sender>bootableBox</sender>
-        <signal>widgetOpened()</signal>
-        <receiver>scanbootloader</receiver>
-        <slot>execute()</slot>
-    </connection>
     <connection>
         <sender>NextBox</sender>
         <signal>widgetOpened()</signal>

bootrecover/bootrecover.sh

@@ -134,7 +134,8 @@ mount -o bind /proc $MOUNTPOINT/proc || {
    abort
 }
 
-if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
+
+if [ "$INSTALL_BOOTLOADER_DEVICE" -o "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then
 
    for k in $MOUNTPOINT/boot/vmlinuz-*; do 
       KVER=${k/*\/boot\/vmlinuz-}
@@ -143,17 +144,53 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
       chroot $MOUNTPOINT mkinitrd -f /boot/initramfs-${KVER}.img ${KVER}
    done
 
-   dcop_write $"Installing bootloader on $INSTALL_BOOTLOADER_DEVICE..." 90
-   echo $"Installing grub bootloader on $INSTALL_BOOTLOADER_DEVICE" | tee -a $LOG_FILE
+   if [ "$INSTALL_BOOTLOADER_DEVICE_EFI" ]; then
+      # EFI
+      dcop_write $"Installing bootloader on ""$INSTALL_BOOTLOADER_DEVICE_EFI (EFI)..." 90
+      echo $"Installing grub bootloader on ""$INSTALL_BOOTLOADER_DEVICE_EFI (EFI)" | tee -a $LOG_FILE
+      [ -e $MOUNTPOINT/boot/efi ] || mkdir -p $MOUNTPOINT/boot/efi
+      mount $INSTALL_BOOTLOADER_DEVICE_EFI $MOUNTPOINT/boot/efi
+      grub-install --root-directory=$MOUNTPOINT --efi-directory=$MOUNTPOINT/boot/efi --target=x86_64-efi \
+         --bootloader-id="openmamba Boot Manager" --recheck --no-floppy
+      umount $MOUNTPOINT/boot/efi
 
-   grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --recheck --no-floppy
+      INSTALL_BOOTLOADER_DEVICE_EFI_BYID=$INSTALL_BOOTLOADER_DEVICE_EFI
+      for f in `ls /dev/disk/by-id/*`; do 
+         if [ "$INSTALL_BOOTLOADER_DEVICE_EFI" = "`readlink -f $f`" ]; then
+            INSTALL_BOOTLOADER_DEVICE_EFI_BYID=$f
+            break
+         fi
+      done
+      sed -i "/^GRUB_INSTALL_DEVICE.*/d" $MOUNTPOINT/etc/sysconfig/grub
+      cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
+GRUB_INSTALL_DEVICE_EFI=$INSTALL_BOOTLOADER_DEVICE_EFI_BYID
+_EOF
 
-   [ "$INSTALL_BOOTLOADER_DEVICE_SETBOOTABLE" = "1" -a \
-     "${INSTALL_BOOTLOADER_DEVICE:8:2}" ] && {
-      parted ${INSTALL_BOOTLOADER_DEVICE:0:8} \
-             set ${INSTALL_BOOTLOADER_DEVICE:8:2} boot on || \
-         echo $"Warning: there was an error setting bootloader partition as bootable." >&2
-   }
+   else
+      # BIOS
+      dcop_write $"Installing bootloader on $INSTALL_BOOTLOADER_DEVICE..." 90
+      echo $"Installing grub bootloader on $INSTALL_BOOTLOADER_DEVICE" | tee -a $LOG_FILE
+      grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --target=i386-pc --recheck --no-floppy
+
+      INSTALL_BOOTLOADER_DEVICE_BYID=$INSTALL_BOOTLOADER_DEVICE
+      for f in `ls /dev/disk/by-id/*`; do 
+         if [ "$INSTALL_BOOTLOADER_DEVICE" = "`readlink -f $f`" ]; then
+            INSTALL_BOOTLOADER_DEVICE_BYID=$f
+            break
+         fi
+      done
+      sed -i "/^GRUB_INSTALL_DEVICE.*/d" $MOUNTPOINT/etc/sysconfig/grub
+      cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
+GRUB_INSTALL_DEVICE=$INSTALL_BOOTLOADER_DEVICE_EFI_BYID
+_EOF
+
+      [ "$INSTALL_BOOTLOADER_DEVICE_SETBOOTABLE" = "1" -a \
+        "${INSTALL_BOOTLOADER_DEVICE:8:2}" ] && {
+         parted ${INSTALL_BOOTLOADER_DEVICE:0:8} \
+                set ${INSTALL_BOOTLOADER_DEVICE:8:2} boot on || \
+            echo $"Warning: there was an error setting bootloader partition as bootable." >&2
+      }
+   fi
 
    [ "$INSTALL_BOOTLOADER_CHAINLOAD" ] && {
       # configure boot chainloader for e.g. windows
@@ -188,6 +225,7 @@ if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
 	    GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"Windows on $GRUB_OTHER_DEV\"")
 	 fi
       done
+      sed -i "/^GRUB_OTHER_.*/d" $MOUNTPOINT/etc/sysconfig/grub
       cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
 GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]})
 GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]})
@@ -207,7 +245,7 @@ fi
 umount $MOUNTPOINT/dev
 umount $MOUNTPOINT/sys
 umount $MOUNTPOINT/proc
-umount $MOUNTPOINT
+sync
 finished
 
 echo $"Installation done. You can now reboot to start the freshly installed system." | tee -a $LOG_FILE

etc/polkit-1/localauthority/10-vendor.d/60-desktop-policy.pkla

@@ -33,3 +33,10 @@ Action=org.freedesktop.NetworkManager.*
 ResultAny=yes
 ResultInactive=no
 ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.kde.kcontrol.kcmclock.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

etc/profile.d/proxy.sh

@@ -0,0 +1,9 @@
+#
+# openmamba system-wide proxy configuration
+#
+[ -e /etc/sysconfig/proxy ] &&  . /etc/sysconfig/proxy
+[ "$http_proxy" ] && export HTTP_PROXY=$http_proxy
+[ "$https_proxy" ] && export HTTPS_PROXY=$https_proxy
+[ "$ftp_proxy" ] && export FTP_PROXY=$ftp_proxy
+[ "$socks_proxy" ] && export SOCKS_PROXY=$socks_proxy
+[ "$no_proxy" ] && export NO_PROXY=$no_proxy

etc/sudoers.d/proxy

@@ -0,0 +1 @@
+Defaults env_keep += "ftp_proxy http_proxy https_proxy socks_proxy no_proxy FTP_PROXY HTTP_PROXY HTTPS_PROXY SOCKS_PROXY NO_PROXY"

etc/sysconfig/proxy

@@ -0,0 +1,17 @@
+# System proxy configuration file
+
+# Here some examples:
+
+# http_proxy=http://proxy.example.com:8080
+# https_proxy=http://proxy.example.com:8080
+# ftp_proxy=http://proxy.example.com:8080
+# socks_proxy=http://proxy.example.com:8080
+# no_proxy=localhost,127.0.0.1
+
+# http_proxy=http://user:password@proxy.example.com:3128
+# https_proxy=http://user:password@proxy.example.com:3128
+# ftp_proxy=http://user:password@proxy.example.com:3128
+
+# http_proxy=http://domain\\user:password@proxy.example.com:8080
+# https_proxy=http://domain\\user:password@proxy.example.com:8080
+# ftp_proxy=http://domain\\user:password@proxy.example.com:8080

mambabase/mambabase.kmdr

@@ -210,35 +210,6 @@
                     <string>www.openmamba.org</string>
                 </property>
             </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label18_2_2_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>100</y>
-                        <width>400</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="font">
-                    <font>
-                        <pointsize>8</pointsize>
-                        <italic>1</italic>
-                    </font>
-                </property>
-                <property name="text">
-                    <string>Copyright (c) 2007-2011 by mambaSoft di Silvan Calarco
-Released under the terms of the GNU GPL v3 license</string>
-                </property>
-                <property name="textFormat">
-                    <enum>AutoText</enum>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignVCenter</set>
-                </property>
-            </widget>
             <widget class="ScriptObject">
                 <property name="name">
                     <cstring>backnext</cstring>
@@ -261,6 +232,35 @@ Released under the terms of the GNU GPL v3 license</string>
                     </stringlist>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label18_2_2_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>100</y>
+                        <width>400</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="font">
+                    <font>
+                        <pointsize>8</pointsize>
+                        <italic>1</italic>
+                    </font>
+                </property>
+                <property name="text">
+                    <string>Copyright (c) 2007-2014 by Silvan Calarco
+Released under the terms of the GNU GPL v3 license</string>
+                </property>
+                <property name="textFormat">
+                    <enum>AutoText</enum>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignVCenter</set>
+                </property>
+            </widget>
         </widget>
         <widget class="GroupBox">
             <property name="name">
@@ -397,7 +397,7 @@ Released under the terms of the GNU GPL v3 license</string>
    URL_OPTIONS="$URL_OPTIONS&amp;newinst=1"
 }
 dcop @dcopid KommanderIf setChecked BackBox false
-/usr/bin/wget -T 30 http://www.openmamba.org/distribution/services/check.html$URL_OPTIONS -o /dev/null
+/usr/bin/wget -T 30 http://www.openmamba.org/distribution/services/check.html$URL_OPTIONS -o /dev/null -O /dev/null
 RET=$?
 if [ $RET -eq 0 ]; then
    dcop @dcopid KommanderIf setVisible checkButton false
@@ -446,72 +446,6 @@ fi
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>checkform2</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>0</x>
-                    <y>300</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@BackBox.setChecked(false)
-@NextBox.setChecked(true)
-. /usr/share/openmamba/pkggroups.db
-
-function check_pkgs() {
-  missing=false
-  rpm -q --whatprovides $1 &gt;/dev/null || missing=true
-}
-
-check_pkgs "$BASE_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_base $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_base true
-
-check_pkgs "$OFFICE_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_office $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_office true
-
-check_pkgs "$MULTIMEDIA_PLAYERS_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_players $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_players true
-
-check_pkgs "$MULTIMEDIA_EDITING_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_multimedia_editing $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_multimedia_editing true
-
-check_pkgs "$INTERNET_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_internet $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_internet true
-
-check_pkgs "$GRAPHICS_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_graphics $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_graphics true
-
-check_pkgs "$GAMES_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_games $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_games true
-
-check_pkgs "$VIRTUALIZATION_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_virtualization $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_virtualization true
-
-check_pkgs "$SERVER_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_server $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked server_prof true
-
-check_pkgs "$DEVEL_PKGS"
-dcop @dcopid KommanderIf setEnabled inst_devel $missing
-[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_devel true
-</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="GroupBox">
             <property name="name">
                 <cstring>GroupBox2_2</cstring>
@@ -592,32 +526,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                     </stringlist>
                 </property>
             </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_internet</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>140</y>
-                        <width>550</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Internet communication and p2p (&amp;kopete, pidgin, ekiga, aMule, ...)</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_graphics</cstring>
@@ -660,7 +568,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                     </rect>
                 </property>
                 <property name="text">
-                    <string>Base development packages (gcc, glibc-devel, kernel sources, ...)</string>
+                    <string>Base &amp;development packages (gcc, glibc-devel, kernel sources, ...)</string>
                 </property>
                 <property name="associations" stdset="0">
                     <stringlist>
@@ -672,7 +580,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
             </widget>
             <widget class="CheckBox">
                 <property name="name">
-                    <cstring>inst_office</cstring>
+                    <cstring>inst_server</cstring>
                 </property>
                 <property name="enabled">
                     <bool>true</bool>
@@ -680,67 +588,13 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                 <property name="geometry">
                     <rect>
                         <x>10</x>
-                        <y>50</y>
+                        <y>260</y>
                         <width>550</width>
                         <height>20</height>
                     </rect>
                 </property>
                 <property name="text">
-                    <string>Off&amp;ice packages (OpenOffice, Groupware, PDA Syncronization, ...)</string>
-                </property>
-                <property name="checked">
-                    <bool>false</bool>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_multimedia_editing</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>110</y>
-                        <width>550</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Mu&amp;ltimedia editing and production (kino, audacity, rosegarden, mixxx, ...)</string>
-                </property>
-                <property name="checked">
-                    <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_players</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>80</y>
-                        <width>550</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Audio and Video players (amarok, &amp;xmms, vlc, kaffeine, miro, ...)</string>
-                </property>
-                <property name="checked">
-                    <bool>false</bool>
+                    <string>Base server packages (apache, postfix, vsftpd, php, m&amp;ysql, ...)</string>
                 </property>
                 <property name="associations" stdset="0">
                     <stringlist>
@@ -784,7 +638,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
             </widget>
             <widget class="CheckBox">
                 <property name="name">
-                    <cstring>inst_server</cstring>
+                    <cstring>inst_office</cstring>
                 </property>
                 <property name="enabled">
                     <bool>true</bool>
@@ -792,13 +646,38 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                 <property name="geometry">
                     <rect>
                         <x>10</x>
-                        <y>260</y>
+                        <y>50</y>
                         <width>550</width>
                         <height>20</height>
                     </rect>
                 </property>
                 <property name="text">
-                    <string>Base server packages (apache, postfix, vsftpd, php, m&amp;ysql, ...)</string>
+                    <string>Off&amp;ice packages (OpenOffice, Groupware, PDA Syncronization, ...)</string>
+                </property>
+                <property name="checked">
+                    <bool>false</bool>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_players</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>80</y>
+                        <width>550</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Audio and Video players (amarok, &amp;xmms, vlc, kaffeine, miro, ...)</string>
+                </property>
+                <property name="checked">
+                    <bool>false</bool>
                 </property>
                 <property name="associations" stdset="0">
                     <stringlist>
@@ -808,6 +687,127 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                     </stringlist>
                 </property>
             </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_multimedia_editing</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>110</y>
+                        <width>550</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Mu&amp;ltimedia editing and production (kino, audacity, rosegarden, mixxx, ...)</string>
+                </property>
+                <property name="checked">
+                    <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_internet</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>140</y>
+                        <width>550</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Internet communication and p2p (&amp;kopete, pidgin, ekiga, aMule, ...)</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>checkform2</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>0</x>
+                    <y>300</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@BackBox.setChecked(false)
+@NextBox.setChecked(true)
+. /usr/share/openmamba/pkggroups.db
+
+function check_pkgs() {
+  missing=false
+  rpm -q --whatprovides $1 &gt;/dev/null || missing=true
+}
+
+check_pkgs "$BASE_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_base $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_base true
+
+check_pkgs "$OFFICE_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_office $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_office true
+
+check_pkgs "$MULTIMEDIA_PLAYERS_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_players $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_players true
+
+check_pkgs "$MULTIMEDIA_EDITING_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_multimedia_editing $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_multimedia_editing true
+
+check_pkgs "$INTERNET_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_internet $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_internet true
+
+check_pkgs "$GRAPHICS_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_graphics $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_graphics true
+
+check_pkgs "$GAMES_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_games $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_games true
+
+check_pkgs "$VIRTUALIZATION_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_virtualization $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_virtualization true
+
+check_pkgs "$SERVER_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_server $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked server_prof true
+
+check_pkgs "$DEVEL_PKGS"
+dcop @dcopid KommanderIf setEnabled inst_devel $missing
+[ "$missing" = "false" ] &amp;&amp; dcop @dcopid KommanderIf setChecked inst_devel true
+</string>
+                </stringlist>
+            </property>
         </widget>
     </widget>
     <widget class="QWidget">
@@ -848,7 +848,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
             <property name="geometry">
                 <rect>
                     <x>10</x>
-                    <y>60</y>
+                    <y>50</y>
                     <width>570</width>
                     <height>110</height>
                 </rect>
@@ -856,7 +856,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
             <property name="text">
                 <string>The following components are recommended for optimal desktop use but do not have an Open Source license. 
 
-Warning: you'll have to accept a license agreement for each selected packages.</string>
+Warning: you'll have to accept a license agreement for most selected packages.</string>
             </property>
             <property name="alignment">
                 <set>WordBreak|AlignTop</set>
@@ -868,14 +868,14 @@ Warning: you'll have to accept a license agreement for each selected packages.</
             </property>
             <property name="geometry">
                 <rect>
-                    <x>20</x>
-                    <y>160</y>
+                    <x>10</x>
+                    <y>131</y>
                     <width>560</width>
-                    <height>220</height>
+                    <height>270</height>
                 </rect>
             </property>
             <property name="title">
-                <string>Non Open Source installations/updates</string>
+                <string>Proprietary software installations/updates</string>
             </property>
             <widget class="Label">
                 <property name="name">
@@ -892,7 +892,7 @@ Warning: you'll have to accept a license agreement for each selected packages.</
             </widget>
             <widget class="CheckBox">
                 <property name="name">
-                    <cstring>inst_flash</cstring>
+                    <cstring>inst_nvidia_legacy</cstring>
                 </property>
                 <property name="enabled">
                     <bool>true</bool>
@@ -900,17 +900,47 @@ Warning: you'll have to accept a license agreement for each selected packages.</
                 <property name="geometry">
                     <rect>
                         <x>20</x>
-                        <y>30</y>
+                        <y>40</y>
                         <width>510</width>
                         <height>20</height>
                     </rect>
                 </property>
                 <property name="text">
-                    <string>F&amp;lash plugin from adobe.com</string>
+                    <string>NVIDIA propri&amp;etary video driver (legacy) from openmamba.org</string>
                 </property>
-                <property name="checked">
+                <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">
@@ -922,7 +952,7 @@ Warning: you'll have to accept a license agreement for each selected packages.</
                 <property name="geometry">
                     <rect>
                         <x>20</x>
-                        <y>60</y>
+                        <y>160</y>
                         <width>500</width>
                         <height>20</height>
                     </rect>
@@ -931,7 +961,7 @@ Warning: you'll have to accept a license agreement for each selected packages.</
                     <string>&amp;Win32 codecs from mplayerhq.hu</string>
                 </property>
                 <property name="checked">
-                    <bool>true</bool>
+                    <bool>false</bool>
                 </property>
             </widget>
             <widget class="CheckBox">
@@ -944,7 +974,7 @@ Warning: you'll have to accept a license agreement for each selected packages.</
                 <property name="geometry">
                     <rect>
                         <x>20</x>
-                        <y>90</y>
+                        <y>140</y>
                         <width>410</width>
                         <height>20</height>
                     </rect>
@@ -962,7 +992,7 @@ Warning: you'll have to accept a license agreement for each selected packages.</
             </widget>
             <widget class="CheckBox">
                 <property name="name">
-                    <cstring>inst_skype</cstring>
+                    <cstring>inst_flash</cstring>
                 </property>
                 <property name="enabled">
                     <bool>true</bool>
@@ -975,9 +1005,193 @@ Warning: you'll have to accept a license agreement for each selected packages.</
                         <height>20</height>
                     </rect>
                 </property>
+                <property name="text">
+                    <string>F&amp;lash plugin from adobe.com</string>
+                </property>
+                <property name="checked">
+                    <bool>false</bool>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_skype</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>200</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
                 <property name="text">
                     <string>S&amp;kype from skype.com</string>
                 </property>
+                <property name="accel">
+                    <number>276824139</number>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_java</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>180</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Oracle &amp;Java 7 from oracle.com</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_spotify</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>220</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Spot&amp;ify from spotify.com</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_virtualbox</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>240</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Virtualbo&amp;x extension pack from virtualbox.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>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_fglrx</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>60</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>AMD/ATI proprietary 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_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>
@@ -994,7 +1208,7 @@ Warning: you'll have to accept a license agreement for each selected packages.</
             <property name="geometry">
                 <rect>
                     <x>0</x>
-                    <y>360</y>
+                    <y>370</y>
                     <width>32</width>
                     <height>32</height>
                 </rect>
@@ -1003,22 +1217,61 @@ Warning: you'll have to accept a license agreement for each selected packages.</
                 <stringlist>
                     <string>@BackBox.setChecked(true)
 @NextBox.setChecked(true)
-rpm -q flashplugin &amp;&amp; {
-   dcop @dcopid KommanderIf setChecked inst_flash false
+rpm -q xorg-drv-video-nvidia &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_nvidia false
 }
 
-rpm -q win32codecs &amp;&amp; {
-   dcop @dcopid KommanderIf setChecked inst_codecs false
+rpm -q xorg-drv-video-nvidia_304 &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_nvidia_legacy false
 }
 
-rpm -q msttcorefonts &amp;&amp; {
-   dcop @dcopid KommanderIf setChecked inst_msttcf false
+rpm -q xorg-drv-video-fglrx &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_fglrx false
 }
 
-rpm -q skype &amp;&amp; {
-   dcop @dcopid KommanderIf setChecked inst_skype false
+rpm -q xorg-drv-video-fglrx &amp;&amp; {
+   dcop @dcopid KommanderIf setEnabled inst_fglrx_legacy false
 }
-</string>
+
+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 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>
@@ -1086,25 +1339,6 @@ rpm -q skype &amp;&amp; {
                 </property>
             </widget>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>qt_dead_widget_ScriptObject8</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>560</x>
-                    <y>340</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>dcop @dcopid KommanderIf setText logbox "`cat ~/.mambabase.log`"
-</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="Label">
             <property name="name">
                 <cstring>Label5_2_2_2</cstring>
@@ -1129,50 +1363,6 @@ rpm -q skype &amp;&amp; {
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>launchinstall</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>10</x>
-                    <y>110</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@NextBox.setChecked(false)
-@BackBox.setChecked(false)
-conffile=~/.mambabase.conf
-cat &gt; $conffile &lt;&lt; _EOF
-#
-# openmamba installation file
-#
-# created by mamba installer wizard
-#
-INSTALL_BASE='@inst_base.checked()'
-INSTALL_OFFICE='@inst_office.checked()'
-INSTALL_PLAYERS='@inst_players.checked()'
-INSTALL_MULTIMEDIA_EDITING='@inst_multimedia_editing.checked()'
-INSTALL_INTERNET='@inst_internet.checked()'
-INSTALL_GRAPHICS='@inst_graphics.checked()'
-INSTALL_GAMES='@inst_games.checked()'
-INSTALL_VIRTUALIZATION='@inst_virtualization.checked()'
-INSTALL_SERVER='@inst_server.checked()'
-INSTALL_DEVEL='@inst_devel.checked()'
-INSTALL_FLASH='@inst_flash.checked()'
-INSTALL_CODECS='@inst_codecs.checked()'
-INSTALL_MSTTCF='@inst_msttcf.checked()'
-INSTALL_SKYPE='@inst_skype.checked()'
-_EOF
-
-@exec("sh /usr/share/openmamba/mambabase/mambabase.sh -y @dcopid &amp;&gt; ~/.mambabase.log &amp;")
-dcop @dcopid KommanderIf execute Timer1</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="Label">
             <property name="name">
                 <cstring>progressText</cstring>
@@ -1205,6 +1395,77 @@ dcop @dcopid KommanderIf execute Timer1</string>
                 <set>AlignTop|AlignHCenter</set>
             </property>
         </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>qt_dead_widget_ScriptObject8</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>560</x>
+                    <y>340</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>dcop @dcopid KommanderIf setText logbox "`cat ~/.mambabase.log`"
+</string>
+                </stringlist>
+            </property>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>launchinstall</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>150</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@NextBox.setChecked(false)
+@BackBox.setChecked(false)
+conffile=~/.mambabase.conf
+cat &gt; $conffile &lt;&lt; _EOF
+#
+# openmamba installation file
+#
+# created by mamba installer wizard
+#
+INSTALL_BASE='@inst_base.checked()'
+INSTALL_OFFICE='@inst_office.checked()'
+INSTALL_PLAYERS='@inst_players.checked()'
+INSTALL_MULTIMEDIA_EDITING='@inst_multimedia_editing.checked()'
+INSTALL_INTERNET='@inst_internet.checked()'
+INSTALL_GRAPHICS='@inst_graphics.checked()'
+INSTALL_GAMES='@inst_games.checked()'
+INSTALL_VIRTUALIZATION='@inst_virtualization.checked()'
+INSTALL_SERVER='@inst_server.checked()'
+INSTALL_DEVEL='@inst_devel.checked()'
+INSTALL_FLASH='@inst_flash.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_B43='@inst_b43.checked()'
+INSTALL_JAVA='@inst_java.checked()'
+INSTALL_SPOTIFY='@inst_spotify.checked()'
+INSTALL_VIRTUALBOX='@inst_virtualbox.checked()'
+_EOF
+
+@exec("sh /usr/share/openmamba/mambabase/mambabase.sh -y @dcopid &amp;&gt; ~/.mambabase.log &amp;")
+dcop @dcopid KommanderIf execute Timer1</string>
+                </stringlist>
+            </property>
+        </widget>
     </widget>
     <widget class="QWidget">
         <property name="name">

mambabase/mambabase.po

@@ -11,19 +11,20 @@ msgstr ""
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:10 _from_rc.cc:15
-#: _from_rc.cc:41
+#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:10 _from_rc.cc:13
+#: _from_rc.cc:46
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-28 16:55+0200\n"
+"POT-Creation-Date: 2014-09-16 23:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: _from_rc.cc:6
@@ -40,19 +41,11 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2008 by mambaSoft di Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
 
 #: _from_rc.cc:11
-msgid "C&heck again"
-msgstr ""
-
-#: _from_rc.cc:12
-msgid "Conf&igure"
-msgstr ""
-
-#: _from_rc.cc:13
 msgid ""
 "This program will complete the installation by adding the minimum "
 "recommended set of packages to the system. Additionally it will let you "
@@ -62,42 +55,50 @@ msgid ""
 "center</i> on the tray icon bar."
 msgstr ""
 
-#: _from_rc.cc:14
+#: _from_rc.cc:12
 msgid "<b>Please, press the Next button to continue.</b>"
 msgstr ""
 
-#: _from_rc.cc:16
+#: _from_rc.cc:14
+msgid "C&heck again"
+msgstr ""
+
+#: _from_rc.cc:15
 msgid "Select installations from network"
 msgstr ""
 
-#: _from_rc.cc:17 _from_rc.cc:30
+#: _from_rc.cc:16 _from_rc.cc:29
 msgid ""
 "Please, select from the boxes below the components that you want to install "
 "or update from network."
 msgstr ""
 
-#: _from_rc.cc:18
+#: _from_rc.cc:17
 msgid "openmamba installation/updates"
 msgstr ""
 
-#: _from_rc.cc:19
+#: _from_rc.cc:18
 msgid "&Games (turacer, pingus, ksudoku, ...)"
 msgstr ""
 
-#: _from_rc.cc:20
+#: _from_rc.cc:19
 msgid "Emulation and virtuali&zation (VirtualBox, kvm, QtEmu, wine, ...)"
 msgstr ""
 
-#: _from_rc.cc:21
-msgid "Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...)"
-msgstr ""
-
-#: _from_rc.cc:22
+#: _from_rc.cc:20
 msgid "Grap&hics software (gimp, digikam, blender, sodipodi, ...)"
 msgstr ""
 
+#: _from_rc.cc:21
+msgid "Base &development packages (gcc, glibc-devel, kernel sources, ...)"
+msgstr ""
+
+#: _from_rc.cc:22
+msgid "Base server packages (apache, postfix, vsftpd, php, m&ysql, ...)"
+msgstr ""
+
 #: _from_rc.cc:23
-msgid "Base development packages (gcc, glibc-devel, kernel sources, ...)"
+msgid "System &base packages (recommended)"
 msgstr ""
 
 #: _from_rc.cc:24
@@ -105,41 +106,41 @@ msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"
 msgstr ""
 
 #: _from_rc.cc:25
+msgid "Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...)"
+msgstr ""
+
+#: _from_rc.cc:26
 msgid ""
 "Mu&ltimedia editing and production (kino, audacity, rosegarden, mixxx, ...)"
 msgstr ""
 
-#: _from_rc.cc:26
-msgid "Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...)"
-msgstr ""
-
 #: _from_rc.cc:27
-msgid "System &base packages (recommended)"
+msgid "Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...)"
 msgstr ""
 
 #: _from_rc.cc:28
-msgid "Base server packages (apache, postfix, vsftpd, php, m&ysql, ...)"
-msgstr ""
-
-#: _from_rc.cc:29
 msgid "Select non Open Source components"
 msgstr ""
 
-#: _from_rc.cc:31
+#: _from_rc.cc:30
 msgid ""
 "The following components are recommended for optimal desktop use but do not "
 "have an Open Source license. \n"
 "\n"
-"Warning: you'll have to accept a license agreement for each selected "
+"Warning: you'll have to accept a license agreement for most selected "
 "packages."
 msgstr ""
 
+#: _from_rc.cc:31
+msgid "Proprietary software installations/updates"
+msgstr ""
+
 #: _from_rc.cc:32
-msgid "Non Open Source installations/updates"
+msgid "NVIDIA propri&etary video driver (legacy) from openmamba.org"
 msgstr ""
 
 #: _from_rc.cc:33
-msgid "F&lash plugin from adobe.com"
+msgid "AMD/ATI proprietary video driver (le&gacy) from openmamba.org"
 msgstr ""
 
 #: _from_rc.cc:34
@@ -151,42 +152,62 @@ msgid "MS TrueT&ype core fonts from sourceforge"
 msgstr ""
 
 #: _from_rc.cc:36
-msgid "Sun Java Developers &Kit (DLJ license)"
+msgid "F&lash plugin from adobe.com"
 msgstr ""
 
 #: _from_rc.cc:37
-msgid "Sun &Java Runtime Environment (DLJ license)"
+msgid "S&kype from skype.com"
 msgstr ""
 
 #: _from_rc.cc:38
-msgid "Skype from skype.com"
+msgid "Oracle &Java 7 from oracle.com"
 msgstr ""
 
 #: _from_rc.cc:39
-msgid "Installation"
+msgid "Spot&ify from spotify.com"
 msgstr ""
 
 #: _from_rc.cc:40
-msgid "Details"
+msgid "Virtualbo&x extension pack from virtualbox.org"
+msgstr ""
+
+#: _from_rc.cc:41
+msgid "&Broadcom B43 proprietary firmware from openwrt.org"
 msgstr ""
 
 #: _from_rc.cc:42
-msgid "Installation in progress..."
+msgid "AMD/ATI proprietary video driver from openmamba.org"
 msgstr ""
 
 #: _from_rc.cc:43
-msgid "Starting installation of selected components..."
+msgid "NVIDIA proprietary video &driver from openmamba.org"
 msgstr ""
 
 #: _from_rc.cc:44
-msgid "End of installation"
+msgid "Installation"
 msgstr ""
 
 #: _from_rc.cc:45
+msgid "Details"
+msgstr ""
+
+#: _from_rc.cc:47
+msgid "Installation in progress..."
+msgstr ""
+
+#: _from_rc.cc:48
+msgid "Starting installation of selected components..."
+msgstr ""
+
+#: _from_rc.cc:49
+msgid "End of installation"
+msgstr ""
+
+#: _from_rc.cc:50
 msgid "Installation completed."
 msgstr ""
 
-#: _from_rc.cc:46
+#: _from_rc.cc:51
 msgid ""
 "If you ran into ploblems, please check the installation log below for "
 "warning or errors and send the report to the openmamba community at <a href="

mambabase/mambabase.sh

@@ -1,9 +1,9 @@
 # openmamba post installation script
-# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 
-VERSION=0.3
+VERSION=1.0
 TEXTDOMAIN=mambabase
 TEXTDOMAINDIR=/opt/kde3/share/locale/
 INSTALL_DATE=`date +%Y%m%d-%H%M`
@@ -50,7 +50,7 @@ DCOPID=$2
 
 echo $"\
 openmamba installation script - version $VERSION
-Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 [ "$DCOPID" ] && dcop $DCOPID KommanderIf setChecked NextBox false
@@ -80,7 +80,14 @@ 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_JRE" = "1" -o "$INSTALL_JDK" = "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_B43" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
+[ "$INSTALL_SPOTIFY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
+[ "$INSTALL_VIRTUALBOX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 
 [ "$DCOPID" ] && dcop $DCOPID KommanderIf setMaximum progressBar $TOTAL_PROGRESS
 
@@ -163,6 +170,48 @@ if [ "$INSTALL_DEVEL" = "1" ]; then
    rpm -q --whatprovides $DEVEL_PKGS >/dev/null || apt_get_parsed install -y $DEVEL_PKGS
 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
+fi
+
+if [ "$INSTALL_FGLRX" = "1" ]; then
+   echo $"Installing AMD/ATI proprietary video driver packages"
+   dcop_write $"Installing/updating AMD/ATI proprietary video driver packages..." 10
+   rpm -q --whatprovides xorg-drv-video-fglrx >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx
+fi
+
+if [ "$INSTALL_FGLRX_LEGACY" = "1" ]; then
+   echo $"Installing AMD/ATI proprietary (legacy) video driver packages"
+   dcop_write $"Installing/updating AMD/ATI proprietary (legacy) video driver packages..." 10
+   rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy
+fi
+
+if [ "$INSTALL_B43" = "1" ]; then
+   echo $"Installing Broadcom B43 proprietary firmware"
+   dcop_write $"Installing Broadcom B43 proprietary firmware..." 10
+   /usr/bin/openmamba-netsrpms b43-firmware
+fi
+
+if [ "$INSTALL_SPOTIFY" = "1" ]; then
+   echo $"Installing Spotify"
+   dcop_write $"Installing Spotify..." 10
+   /usr/bin/openmamba-netsrpms spotify
+fi
+
+if [ "$INSTALL_VIRTUALBOX" = "1" ]; then
+   echo $"Installing Virtualbox extension pack"
+   dcop_write $"Installing Virtualbox extension pack..." 10
+   /usr/bin/openmamba-netsrpms virtualbox-extension-pack
+fi
+
 if [ "$INSTALL_FLASH" = "1" ]; then
    echo $"Installing flash plugin"
    dcop_write $"Installing Flash plugin..." 10

mambabase/po/es.po

@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2011 by Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2011 by Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL versione 3"
 
 #: _from_rc.cc:10

mambabase/po/it.po

@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2011 by Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2011 by Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL versione 3"
 
 #: _from_rc.cc:10

mambabase/po/it.po~

@@ -1,350 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:12 _from_rc.cc:42
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-27 22:05+0100\n"
-"Last-Translator: Silvan Calarco <silvan.calarco@mambasoft.it>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: _from_rc.cc:1
-msgid "openmamba base network installations"
-msgstr "Installazioni base di openmamba dalla rete"
-
-#: _from_rc.cc:2
-msgid "Welcome!"
-msgstr "Benvenuto!"
-
-#: _from_rc.cc:6
-msgid "Version 0.1"
-msgstr ""
-
-#: _from_rc.cc:7
-msgid "www.openmamba.org"
-msgstr ""
-
-#: _from_rc.cc:8 mamba.kmdr:294
-msgid "version"
-msgstr ""
-
-#: _from_rc.cc:9
-msgid ""
-"Copyright (c) 2007 by Silvan Calarco\n"
-"Released under the terms of the GNU GPL v3 license"
-msgstr ""
-"Copyright (c) 2007 by Silvan Calarco\n"
-"Rilasciato secondo i termini della licenza GNU GPL versione 3"
-
-#: _from_rc.cc:10
-msgid "GNU/Linux distribution"
-msgstr "Distribuzione GNU/Linux"
-
-#: _from_rc.cc:11
-msgid ""
-"This program will complete the installation by adding the minimum "
-"recommended set of packages to the system. Additionally it will let you "
-"install, upon selection, macro-group of packages and proprietary software "
-"components.\n"
-"<br><b>TIP:</b> you may run this program later from the <i>openmamba control "
-"center</i> on the tray icon bar."
-msgstr ""
-"Questo programma completerà l'installazione aggiungendo un set minimo di "
-"pacchetti raccomandati per il sistema. Inoltre permette di selezionare ed installare "
-"macro-gruppi di pacchetti e componenti di software proprietario.\n"
-"<br><b>SUGGERIMENTO:</b> puoi eseguire questo programma in qualunque momento dal <i>"
-"Centro di controllo openmamba</i> sulla tray icon bar."
-
-#: _from_rc.cc:13
-msgid "Conf&igure"
-msgstr "Conf&igura"
-
-#: _from_rc.cc:12
-msgid "<b>Please, press the Next button to continue.</b>"
-msgstr "<b>Premi il pulsante Successivo per continuare.</b>"
-
-#: _from_rc.cc:13
-msgid "Error: could not contact repository host (www.openmamba.org)."
-msgstr "Errore: impossibile contattare il repository (www.openmamba.org)."
-
-#: _from_rc.cc:13
-msgid "Please check your network configuration and press the button below to try again."
-msgstr "Verifica la configurazione della rete e premi il bottone sottostante per riprovare."
-
-#: _from_rc.cc:13
-msgid "<b>Press the Next button to continue.</b>"
-msgstr "<p>Premi il pulsante Successivo per continuare.</b>"
-
-
-#: _from_rc.cc:14
-msgid "C&heck again"
-msgstr "Controlla di nuovo"
-
-#: _from_rc.cc:15
-msgid "Select installations from network"
-msgstr "Scelta delle installazioni dalla rete"
-
-#: _from_rc.cc:16 _from_rc.cc:30
-msgid ""
-"Please, select from the boxes below the components that you want to install "
-"or update from network."
-msgstr ""
-"Seleziona nelle caselle sottostanti i componenti che desideri installare "
-"o aggiornare dalla rete."
-
-#: _from_rc.cc:17
-msgid "openmamba installation/updates"
-msgstr "installazioni/aggiornamenti di openmamba"
-
-#: _from_rc.cc:18
-msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"
-msgstr "Programmi per l'&ufficio (OpenOffice, Sincronizzazione, ...)"
-
-#: _from_rc.cc:19
-msgid "Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...)"
-msgstr "Player audio e video (amarok, xmms, vlc, kaffeine, miro, ...)"
-
-#: _from_rc.cc:20
-msgid "Mu&ltimedia editing and production (kino, audacity, rosegarden, mixxx, ...)"
-msgstr "Produzione multimediale (kino, audacity, rosegarden, mixxx, ...)""
-
-#: _from_rc.cc:21
-msgid "Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...)"
-msgstr "Programmi per internet (&kopete, pidgin, ekiga, aMule, ...)"
-
-#: _from_rc.cc:23
-msgid "Grap&hics software (gimp, digikam, blender, sodipodi, ...)"
-msgstr "Programmi per la gra&fica (gimp, digikam, blender, sodipodi, ...)"
-
-#: _from_rc.cc:24
-msgid "&Games (turacer, pingus, ksudoku, ...)"
-msgstr "&Giochi (tuxracer, pingus, ksudoku, ...)"
-
-#: _from_rc.cc:25
-msgid "Emulation and virtuali&zation (VirtualBox, kvm, QtEmu, wine, ...)"
-msgstr "Emulatori e virtuali&zzatori (VirtualBox, kvm, QtEmu, wine, ...)"
-
-#: _from_rc.cc:22
-msgid "Base server packages (apache, postfix, vsftpd, php, mysql, ...)"
-msgstr "Servizi di rete base (apache, postfix, vsftpd, php, mysql, ...)"
-
-#: _from_rc.cc:26
-msgid "Base development packages (gcc, glibc-devel, kernel sources, ...)"
-msgstr "Ambiente di svilupppo base (gcc, glibc-devel, sorgenti del kernel, ...)"
-
-#: _from_rc.cc:27
-msgid "S&ystem update"
-msgstr "Aggiornamento del &sistema"
-
-#: _from_rc.cc:28
-msgid "System &base packages (recommended)"
-msgstr "Pacchetti &base del sistema (raccomandato)"
-
-#: _from_rc.cc:29
-msgid "Select non Open Source components"
-msgstr "Scegliere i componenti non Open Source"
-
-#: _from_rc.cc:31
-msgid ""
-"The following components are recommended for optimal desktop use but do not "
-"have an Open Source license. \n"
-"\n"
-"Warning: you'll have to accept a license agreement for each selected "
-"packages."
-msgstr ""
-"I seguenti componenti sono raccomandati per un uso ottimale del desktop ma "
-"non hanno una licenza Open Source. \n"
-"\n"
-"Attenzione: occorre accettare una licenza specifica per ognuno dei "
-"componenti selezionati."
-
-#: _from_rc.cc:32
-msgid "Non Open Source installations/updates"
-msgstr "Installazioni/aggiornamenti di software non Open Source"
-
-#: _from_rc.cc:33
-msgid "F&lash plugin from adobe.com"
-msgstr "Plugin flash da adobe.com"
-
-#: _from_rc.cc:34
-msgid "&Win32 codecs from mplayerhq.hu"
-msgstr "Codec &Win32 da mplayerhq.hu"
-
-#: _from_rc.cc:35
-msgid "MS TrueT&ype core fonts from sourceforge"
-msgstr "Font MS TrueType da sourceforge"
-
-#: _from_rc.cc:36
-msgid "Sun Java Developers &Kit (DLJ license)"
-msgstr "Sun Java Developers &Kit (licenza DLJ)"
-
-#: _from_rc.cc:37
-msgid "Sun &Java Runtime Environment (DLJ license)"
-msgstr "Sun &Java Runtime Environment (licenza DLJ)"
-
-#: _from_rc.cc:38
-msgid "Installation"
-msgstr "Installazione"
-
-#: _from_rc.cc:39
-msgid "Installation in progress..."
-msgstr "Installazione in corso..."
-
-#: _from_rc.cc:40
-msgid "Starting installation of selected components..."
-msgstr "Avvio dell'installazione dei componenti selezionati..."
-
-
-#: _from_rc.cc:41
-msgid "Details"
-msgstr "Dettagli"
-
-#: _from_rc.cc:43
-msgid "End of installation"
-msgstr "Fine dell'installazione"
-
-#: _from_rc.cc:44
-msgid "Installation completed."
-msgstr "Installazione completata."
-
-#: _from_rc.cc:45
-msgid ""
-"If you ran into ploblems, please check the installation log below for "
-"warning or errors and send the report to the openmamba community at <a href="
-"\"http://www.openmamba.org\">www.openmamba.org</a>."
-msgstr ""
-"Se hai incontrato dei problemi, per favore controlla se il log di installazione "
-"riporta dei messaggi di errore ed invia un rapporto alla comunità di openmamba su "
-"<a href=\"http://www.openmamba.org\">www.openmamba.org</a>."
-#: mambabase.sh:37
-msgid "Warning: this script will perform an automatic installation erasing all the"
-msgstr "Attenzione: questo script effettuerà un'installazione automatica cancellando tutti"
-#: mambabase.sh:38
-msgid "         contents of device $INSTALL_DEVICE; use $0 -y to actually start the"
-msgstr "            i contenuti del dispositivo $INSTALL_DEVICE; usa $0 -y per avviare"
-#: mambabase.sh:39
-msgid "         operation."
-msgstr "            l'operazione."
-#: mambabase.sh:49
-msgid ""
-"openmamba installation script - version $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
-msgstr ""
-"Script di installazione di openmamba - versione $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
-#: mambabase.sh:55
-msgid "Starting installation..."
-msgstr "Avvio dell'installazione..."
-#: mambabase.sh:58
-msgid "Error: cannot read input file $INPUT_FILE; aborting."
-msgstr "Errore: impossibile leggere il file $INPUT_FILE; uscita."
-#: mambabase.sh:85
-msgid "Installing openmamba base packages"
-msgstr "Installazione dei pacchetti base di openmamba"
-#: mambabase.sh:86
-msgid "Updating packages list..."
-msgstr "Aggiornamento della lista dei pacchetti..."
-#: mambabase.sh:89
-msgid "Removing packages that are no longer needed..."
-msgstr "Rimozione dei pacchetti non più necessari..."
-#: mambabase.sh:99
-msgid "Installing/updating openmamba base packages..."
-msgstr "Installazione/aggiornamento dei pacchetti base di openmamba..."
-#: mambabase.sh:104
-msgid "Updating installed packages"
-msgstr "Aggiornamento dei pacchetti installati"
-#: mambabase.sh:105
-msgid "Updating installed packages..."
-msgstr "Aggiornamento dei pacchetti installati..."
-#: mambabase.sh:110
-msgid "Installing Office packages"
-msgstr "Installazione dei programmi per l'ufficio"
-#: mambabase.sh:111
-msgid "Installing/updating Office packages..."
-msgstr "Installazione/aggiornamento dei programmi per l'ufficio..."
-#: mambabase.sh:122
-msgid "Installing Audio and Video players"
-msgstr "Installazione dei riproduttori audio e video"
-#: mambabase.sh:123
-msgid "Installing/updating Audio and Video players..."
-msgstr "Installazione/aggiornamento dei riproduttori audio e video..."
-#: mambabase.sh:116
-msgid "Installing multimedia editing and production packages"
-msgstr "Installazione dei programmi per l'editing e il montaggio audio e video"
-#: mambabase.sh:117
-msgid "Installing/updating multimedia editing and production packages..."
-msgstr "Installazione/aggiornamento dei programmi per l'editing e il montattio audio e video..."
-#: mambabase.sh:134
-msgid "Installing Internet packages"
-msgstr "Installazione dei pacchetti per internet"
-#: mambabase.sh:135
-msgid "Installing/updating Internet packages..."
-msgstr "Installazione/aggiornamento dei programmi per internet..."
-#: mambabase.sh:140
-msgid "Installing Graphics packages"
-msgstr "Installazione dei programmi di grafica"
-#: mambabase.sh:141
-msgid "Installing/updating Graphics packages..."
-msgstr "Installazione/aggiornamento dei programmi di grafica..."
-#: mambabase.sh:146
-msgid "Installing Games packages"
-msgstr "Installazione dei giochi"
-#: mambabase.sh:147
-msgid "Installing/updating Games packages..."
-msgstr "Installazione/aggiornamento dei giochi..."
-#: mambabase.sh:152
-msgid "Installing Virtualization packages"
-msgstr "Installazione dei programmi per la virtualizzazione"
-#: mambabase.sh:153
-msgid "Installing/updating Virtualization packages..."
-msgstr "Installazione/aggironamento dei programmi per la virtualizzazione..."
-#: mambabase.sh:128
-msgid "Installing Server packages"
-msgstr "Installazione dei pacchetti per server di rete"
-#: mambabase.sh:129
-msgid "Installing/updating Server packages..."
-msgstr "Installazione/aggiornamento dei pacchetti per server di rete..."
-#: mambabase.sh:158
-msgid "Installing openmamba Development packages"
-msgstr "Installazione dei pacchetti per lo sviluppo"
-#: mambabase.sh:159
-msgid "Installing/updating openmamba Development packages..."
-msgstr "Installazione/aggiornamento dei pacchetti per lo sviluppo..."
-#: mambabase.sh:164
-msgid "Installing flash plugin"
-msgstr "Installazione del plugin flash"
-#: mambabase.sh:165
-msgid "Installing Flash plugin..."
-msgstr "Installazione del plugin flash..."
-#: mambabase.sh:167
-msgid "Executing nspluginscan"
-msgstr "Eseguo nspluginscan"
-#: mambabase.sh:170
-msgid "Removing gnash"
-msgstr "Rimozione di gnash"
-#: mambabase.sh:176
-msgid "Installing win32 codecs"
-msgstr "Installazione dei codec win32"
-#: mambabase.sh:177
-msgid "Installing Win32 codecs..."
-msgstr "Installazione dei codec win32..."
-#: mambabase.sh:182
-msgid "Installing MS TrueType core fonts..."
-msgstr "Installazione dei font MS TrueType..."
-#: mambabase.sh:187
-msgid "Installing Sun Java Developers Kit..."
-msgstr "Installazione del Sun Java Developers Kit"
-#: mambabase.sh:191
-msgid "Installing Sun Java Runtime Environment..."
-msgstr "Installazione del Sun Java Runtime Environment..."
-#: mambabase.sh:197
-msgid "Press next to see the installation log and exit."
-msgstr "Premi Successivo per vedere il log dell'installazione ed uscire."

mambabase/update-translations.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# not working yet
+kmdr2po mambabase.kmdr > mambabase.po
+xgettext -s -o - mambabase.sh > mambabase.sh.po
+msgmerge mambabase.sh.po po/it.po > po/it.pot

mambareport/openmamba-makereport

@@ -2,7 +2,7 @@
 #
 # openmamba system report generation tool
 #
-# Copyright (c) 2008-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2008-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
 VERSION=20110807
@@ -11,26 +11,20 @@ TEMPFILE=`tempfile`
 . ${ROOT}/etc/sysconfig/machine
 
 [ ! "$SYSTEM_MANUFACTURER" -o "$SYSTEM_MANUFACTURER" = "System manufacturer" ]  && {
-   echo -n "Please enter the name of the system manufacturer: "
-   read SYSTEM_MANUFACTURER
+   SYSTEM_MANUFACTURER=unknown
 }
 
 [ ! "$SYSTEM_PRODUCT_NAME" -o "$SYSTEM_PRODUCT_NAME" = "System Product Name" ]  && {
-   echo -n "Please enter the name of the system product name: "
-   read SYSTEM_PRODUCT_NAME
+   SYSTEM_PRODUCT_NAME=unknown
 }
 
 [ ! "$SYSTEM_SERIAL_NUMBER" -o "$SYSTEM_SERIAL_NUMBER" = "System Serial Number" ]  && {
-   echo -n "Please enter the name of the system serial number: "
-   read SYSTEM_SERIAL_NUMBER
+   SYSTEM_SERIAL_NUMBER=unknown
 }
 
-SYSTEM_MANUFACTURER=`echo $SYSTEM_MANUFACTURER | tr ' ' _`
-SYSTEM_MANUFACTURER=`echo $SYSTEM_MANUFACTURER | tr '-' _`
-SYSTEM_PRODUCT_NAME=`echo $SYSTEM_PRODUCT_NAME | tr ' ' _`
-SYSTEM_PRODUCT_NAME=`echo $SYSTEM_PRODUCT_NAME | tr '-' _`
-SYSTEM_SERIAL_NUMBER=`echo $SYSTEM_SERIAL_NUMBER | tr ' ' _`
-SYSTEM_SERIAL_NUMBER=`echo $SYSTEM_SERIAL_NUMBER | tr '-' _`
+SYSTEM_MANUFACTURER=`echo $SYSTEM_MANUFACTURER | tr ' ' _ | tr '-' _ | tr '/' _`
+SYSTEM_PRODUCT_NAME=`echo $SYSTEM_PRODUCT_NAME | tr ' ' _ | tr '-' _ | tr '/' _`
+SYSTEM_SERIAL_NUMBER=`echo $SYSTEM_SERIAL_NUMBER | tr ' ' _ | tr '-' _ | tr '/' _`
 
 REPORTNAME="openmamba-report-$SYSTEM_MANUFACTURER-$SYSTEM_PRODUCT_NAME-$SYSTEM_SERIAL_NUMBER.txt"
 
@@ -129,7 +123,7 @@ _EOF
 }
 
 echo "openmamba report generation tool $VERSION"
-echo "Copyright (c) 2008-2011 by Silvan Calarco"
+echo "Copyright (c) 2008-2013 by Silvan Calarco"
 echo
 
 [ $UID = 0 ] || {

mambawelcome/mambawelcome-init

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # mambawelcome - start mambawelcome on first time system execution
-# Copyright (c) 2007-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 
 if [ $UID != 0 ]; then
    echo "$0: must be superuser." >&2
@@ -29,9 +29,12 @@ xinit /opt/kde3/bin/kmdr-executor /usr/share/openmamba/mambawelcome/mambawelcome
 #/opt/kde3/bin/dcopserver_shutdown
 killall -9 dcopserver
 
-[ -e /root/.mambawelcome-not-completed ] && {
+if [ -e /root/.mambawelcome-not-completed ]; then
    rm -f /root/.mambawelcome-not-completed
-   halt
-}
+   poweroff
+else
+   systemctl disable mambawelcome.target
+   systemctl isolate graphical.target
+fi
 
 exit 0

mambawelcome/mambawelcome.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=openmamba 2nd stage installation welcome dialog
+Conflicts=getty@tty1.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
+
+[Service]
+ExecStart=/usr/share/openmamba/mambawelcome/mambawelcome
+Restart=always
+IgnoreSIGPIPE=no
+
+[Install]
+WantedBy=mambawelcome.target

mambawelcome/mambawelcome.sh

@@ -72,6 +72,7 @@ dcop_write $"Configuring users and host..." 50
 echo $"Configuring users and host" | tee -a $LOG_FILE
 # configure user
 [ "$INSTALL_USER" ] && {
+   userdel -rf liveuser
    useradd $INSTALL_USER \
           -c "$INSTALL_USER_FULLNAME" \
           -G audio,filesharing,sysadmin,packager,lpadmin,video,nopermfs || {
@@ -148,13 +149,15 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
 
 # set hostname and domain
 [[ "$INSTALL_HOSTNAME" ]] && {
-   hostname $INSTALL_HOSTNAME
-   sed -i "s|HOSTNAME=.*|HOSTNAME=$INSTALL_HOSTNAME|" \
-   /etc/sysconfig/network
-
-   [[ "$INSTALL_DOMAIN" ]] || INSTALL_DOMAIN="localdomain"
-   sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $INSTALL_HOSTNAME.$INSTALL_DOMAIN $INSTALL_HOSTNAME localhost.localdomain localhost|" \
-      /etc/hosts
+   if [ "${INSTALL_HOSTNAME/.*}" != "${INSTALL_HOSTNAME}" -o "${INSTALL_DOMAIN}" = "localdomain" ]; then
+      hostnamectl set-hostname $INSTALL_HOSTNAME
+      if [ "${INSTALL_DOMAIN}" != "localdomain" ]; then
+         sed -i "s|\(127\.0\.0\.1\W*\)\(.*\)|\1 $INSTALL_HOSTNAME.$INSTALL_DOMAIN $INSTALL_HOSTNAME localhost.localdomain localhost|" \
+            /etc/hosts
+      fi
+   elif [ "${INSTALL_DOMAIN}" != "localdomain" ]; then
+      hostnamectl set-hostname $INSTALL_HOSTNAME.$INSTALL_DOMAIN
+   fi
 }
 
 # set samba configuration file

mambawelcome/mambawelcome.target

@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Mambawelcome 2nd stage install target
+Documentation=man:systemd.special(7)
+Requires=multi-user.target
+After=multi-user.target
+Conflicts=rescue.target
+AllowIsolate=yes
+
+[Install]
+Alias=default.target

menu/applications/netinstall/spotify.desktop.in

@@ -0,0 +1,19 @@
+[Desktop Entry]
+Name=Install Spotify
+Name[es]=Instala Spotify
+Name[fr]=Installation du Spotify
+Name[it]=Installa Spotify
+Comment=Install Spotify from network
+Comment[es]=Instala Spotify por red
+Comment[fr]=Installation du Spotify depuis le réseau
+Comment[it]=Installa Spotify dalla rete
+Encoding=UTF-8
+Exec=@bindir@/openmamba-netsrpms spotify
+Icon=distromenu-spotify
+MimeType=
+Path=
+StartupNotify=false
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=X-@distroID@-NetInstall;

openmamba-update/openmamba-netsrpms

@@ -2,10 +2,12 @@
 #
 # netsrpm-install.sh - Build srpms that download sources from network
 #
-# Copyright (C) 2003-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2003-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005 by Massimo Pintore <massimo.pintore@qilinux.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@qilinux.it>
 
+TEXTDOMAINDIR=/usr/share/locale/
+TEXTDOMAIN=openmamba-update
 me="${0##*/}"
 DISTRO_SRPMS_DIR=/usr/share/openmamba/SRPMS
 rpmdir=$(rpm --eval=%{_rpmdir} 2>/dev/null)
@@ -13,17 +15,22 @@ rpmdir=$(rpm --eval=%{_rpmdir} 2>/dev/null)
 while [ "$1" ]; do
    case $1 in
       -c) CHECK_MODE=1 ;;
+      -f) FORCE_MODE=1 ;;
       -u) UPGRADE_MODE=1 ;;
+      -h|--help) PACKAGES= ; break ;;
+      -*) echo $"Error: invalid option $1; aborting."; exit 1 ;;
       *) PACKAGES="$PACKAGES $1"
    esac
    shift
 done
 
 if [ -z "$PACKAGES" ]; then
-   echo "Usage:
-$me [-c] pkgname ...
+   echo $"Usage:
+$me [options...] pkgname ...
 
+Options:
 -c: only check and exit (returns: 0: up-to-date; 1: needs update; 2: not installed)
+-f: force reinstallation if already installed
 -u: only upgrade if already installed
 "
    exit 255
@@ -33,27 +40,25 @@ function check_if_already_installed() {
    rpm -q $1 &>/dev/null
    if [ $? -eq 0 ]; then
       notify-send -a $"Network software installation" -i $icon "$pckname" "$pckname: "$"already installed."
-   else
-      notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing"" $pckname!"
    fi
 }
 
+declare -A SRPMVERSION SRPMRELEASE
+. /etc/sysconfig/netsrpminstall || exit 1
+
 for pckname in $PACKAGES; do
 
-   icon=`grep Icon= /usr/share/applications/openmamba-$pckname.desktop | sed "s|Icon=||"`
+   SRPM_PATH=$DISTRO_SRPMS_DIR/${pckname}
+   SPEC_PATHNAME=$SRPM_PATH/${pckname}.spec
 
-   SRPM_NAME=`\
-      find $DISTRO_SRPMS_DIR \
-         -regex ".*/${pckname//+/\\+}-[^-]*-[^-]*" -printf "%f " 2>/dev/null`
-
-   [ "$SRPM_NAME" ] || {
-      echo "$me: $pckname is missing in $DISTRO_SRPMS_DIR; aborting."
+   [ -r "$SPEC_PATHNAME" ] || {
+      echo $"$me: $pckname is missing in $DISTRO_SRPMS_DIR; aborting."
       exit 255
    }
 
-   SRPM_VERSION=`\
-      echo $SRPM_NAME | \
-      sed "s|${pckname//+/\\+}-\([^-]*-[^-]*\).src.rpm|\1|" 2>/dev/null`
+   icon=`grep Icon= /usr/share/applications/openmamba-$pckname.desktop | sed "s|Icon=||"`
+
+   SRPM_VERSION=${SRPMVERSION[${pckname}]}-${SRPMRELEASE[${pckname}]}
 
    RPM_INSTALLED=`rpm -q $pckname`
    [ $? -eq 0 ] || RPM_INSTALLED=
@@ -62,9 +67,9 @@ for pckname in $PACKAGES; do
       echo $RPM_INSTALLED | \
       sed "s|${pckname//+/\\+}-\([^-]*-[^-]*\)\..*|\1|" 2>/dev/null`
 
-   echo "Package name:      $pckname"
-   echo "Installed version: $RPM_INSTALLED_VERSION"
-   echo "Last version:      $SRPM_VERSION"
+   echo $"Package name:      $pckname"
+   echo $"Installed version: $RPM_INSTALLED_VERSION"
+   echo $"Last version:      $SRPM_VERSION"
    echo
 
    if [ "$RPM_INSTALLED_VERSION" != "$SRPM_VERSION" ]; then
@@ -73,51 +78,59 @@ for pckname in $PACKAGES; do
       elif [ "$UPGRADE_MODE" ]; then
          continue
       fi
-   elif [ "$UPGRADE_MODE" ]; then
+   elif [ ! "$FORCE_MODE" ]; then
       continue
    fi
 
    if [ ! "$CHECK_MODE" ]; then
-      SRPM_PATH=${DISTRO_SRPMS_DIR}/${SRPM_NAME}
-
-      if [ ! -f $SRPM_PATH ]; then
-         echo "$me: "$"missing SRPM \`$SRPM_PATH'."" "$"Aborting..." >&2
-         exit 255
-      fi
-
-      tmpfile=`mktemp -q -t $me.XXXXXXXX` || {
-         echo "$me: error: cannot create temporary files; aborting."
-         exit 255
-       }
-
-      tmpdir=`mktemp -d -q -t $me.XXXXXXXX` || {
-         echo "$me: error: cannot create temporary directory; aborting."
-         exit 255
-       }
-
-      # get license agreement
-      ( rpm2cpio $SRPM_PATH > $tmpfile &&
-        cd $tmpdir &&
-        cpio --quiet --extract --make-directories < $tmpfile ) 2>/dev/null
-
-      if [ -f $tmpdir/LICENSE ]; then
-         license-dialog $tmpdir/LICENSE
-         [ $? -ne 0 ] && exit 1
+      if [ -f ${SRPM_PATH}/LICENSE ]; then
+         if [ "$DISPLAY" ]; then
+            license-dialog ${SRPM_PATH}/LICENSE
+            [ $? -ne 0 ] && exit 1
+         else
+            echo $"You must accept the following license terms:"
+            echo
+            more ${SRPM_PATH}/LICENSE
+            echo -n $"Do you agree with the above license terms [y/N]? "
+            read ans
+            [ "$ans" = "Y" -o "$ans" = "y" -o "$ans" = "s" -o "$ans" = "S" ] || exit 1
+         fi
       fi
 
       notify-send -a $"Network software installation" -i $icon "$pckname" $"$pckname installation in progress..."
 
       # build rpm
-      echo "$me: "$"rebuilding package \`$SRPM_PATH'..."
-      rpmbuild --rebuild $SRPM_PATH --define="%_rpmdir $tmpdir"
+      tmpfile=`mktemp -q -t $me.XXXXXXXX` || {
+         echo "$me: "$"error: cannot create temporary files; aborting."
+         exit 255
+      }
+
+      tmpdir=`mktemp -d -q -t $me.XXXXXXXX` || {
+         echo "$me: "$"error: cannot create temporary directory; aborting."
+         exit 255
+       }
+
+      echo "$me: "$"rebuilding package \`$pckname'..."
+
+      sed "s|@SRPMVERSION@|${SRPMVERSION[${pckname}]}|g;s|@SRPMRELEASE@|${SRPMRELEASE[${pckname}]}|g" \
+         ${SPEC_PATHNAME} >> $tmpfile
+
+      rpmbuild --ba \
+         --define="%_rpmdir $tmpdir" \
+         --define="%_sourcedir ${SRPM_PATH}" \
+         $tmpfile
+
       if [ $? -gt 0 ]; then
-         echo "$me: "$"error rebuilding \`$SRPM_PATH'."" "$"Aborting..." >&2
-         check_if_already_installed $pckname
+         echo "$me: "$"error rebuilding \`$pckname'."" "$"Aborting..." >&2
+         notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing"" $pckname!"
          exit 255
       fi
       RPM_PATH=`find $tmpdir -name \*.rpm`
 
       # install rpm
+      if [ "$FORCE_MODE" = "1" ]; then
+         sudo smart remove -y $pckname
+      fi
       sudo smart install -y $RPM_PATH
       if [ $? -gt 0 ]; then
          echo "$me: "$"error installing \`$RPM_PATH'."" "$"Aborting..." >&2
@@ -136,8 +149,16 @@ for pckname in $PACKAGES; do
    fi
 done
 
-[ "$UPDATE_NEEDED" ] && {
-   echo "Update needed."
-   exit 1
-}
+if [ "$CHECK_MODE" ]; then
+   if [ "$UPDATE_NEEDED" ]; then
+      echo $"Update needed."
+      exit 1
+   fi
+   rpm -q $pckname > /dev/null
+   if [ $? -eq 1 ]; then
+      echo $"Not installed."
+      exit 2
+   fi
+fi
+
 exit 0

openmamba-update/openmamba-update

@@ -35,7 +35,7 @@ script_name="$(basename $0 2>/dev/null)"
 
 function usage() {
 
-echo "Usage: $script_name [OPTION][groupname ..]
+echo $"Usage: $script_name [OPTION][groupname ..]
 
 Options:
   -f, --full
@@ -77,7 +77,7 @@ while [ "$1" ]; do
    shift
 done
 
-[ "$list_mode" ] && echo "Available installation groups (*=installed,+=needs update):"
+[ "$list_mode" ] && echo $"Available installation groups (*=installed,+=needs update):"
 for i in `seq 1 ${#PKG_GROUPS[*]}`; do
    eval instpkgs=(\$`echo ${PKG_GROUPS[$i-1]}`)
    totpkgs=`expr $totpkgs + ${#instpkgs[*]}`
@@ -117,14 +117,14 @@ if [ "$installnames" ]; then
       done
    done
 elif [ "$needupdategroups" ]; then
-   echo -n "The following groups need to be updated: "
+   echo -n $"The following groups need to be updated: "
    for n in $needupdategroups; do 
       echo -n "${PKG_NAMES[$n]} "
       installgroups="$installgroups $n"
    done
    echo
    [ "$assume_yes" ] || {
-      echo -n "Proceed with update [Y/n]?"
+      echo -n $"Proceed with update [Y/n]?"
       read ans
       [ "$ans" = "n" -o "$ans" = "N" ] && exit 0
    }

openmamba-update/po/it.po

@@ -0,0 +1,132 @@
+#: openmamba-netsrpms:21
+msgid "Error: invalid option $1; aborting."
+msgstr "Errore: opzione $1 non valida; uscita."
+#: openmamba-netsrpms:28
+msgid ""
+"Usage:\n"
+"$me [options...] pkgname ...\n"
+"\n"
+"Options:\n"
+"-c: only check and exit (returns: 0: up-to-date; 1: needs update; 2: not installed)\n"
+"-f: force reinstallation if already installed\n"
+"-u: only upgrade if already installed\n"
+""
+msgstr ""
+"Uso:\n"
+"$me [opzioni...] pkgname ...\n"
+"\n"
+"Opzioni:\n"
+"-c: controlla soltanto ed esci (ritorna: 0: aggiornato; 1: richiede aggiornamento; 2: non installato)\n"
+"-f: forza la reinstallazione se già installato\n"
+"-u: aggiorna soltanto se già installato\n"
+""
+#: openmamba-netsrpms:42
+msgid "Network software installation"
+msgstr "Installazione di software dalla rete"
+#: openmamba-netsrpms:42
+msgid "already installed."
+msgstr "già installato"
+#: openmamba-netsrpms:55
+msgid "$me: $pckname is missing in $DISTRO_SRPMS_DIR; aborting."
+msgstr "$me: $pckname non è presente in $DISTRO_SRPMS_DIR; uscita."
+#: openmamba-netsrpms:70
+msgid "Package name:      $pckname"
+msgstr "Nome pacchetto:      $pckname"
+#: openmamba-netsrpms:71
+msgid "Installed version: $RPM_INSTALLED_VERSION"
+msgstr "Versione installata: $RPM_INSTALLED_VERSION"
+#: openmamba-netsrpms:72
+msgid "Last version:      $SRPM_VERSION"
+msgstr "Ultima versione:     $SRPM_VERSION"
+#: openmamba-netsrpms:89
+msgid "missing SRPM \\`$SRPM_PATH'."
+msgstr "SRPM mancante \\`$SRPM_PATH'."
+#: openmamba-netsrpms:89
+msgid "Aborting..."
+msgstr "Uscita..."
+#: openmamba-netsrpms:94
+msgid "error: cannot create temporary files; aborting."
+msgstr "errore: non posso creare files temporanei; uscita."
+#: openmamba-netsrpms:99
+msgid "error: cannot create temporary directory; aborting."
+msgstr "errore: non posso creare una cartella temporanea; uscita."
+#: openmamba-netsrpms:113
+msgid "You must accept the following license terms:"
+msgstr "Devi accettare i termini della seguente licenza:"
+#: openmamba-netsrpms:116
+msgid "Do you agree with the above license terms [y/N]? "
+msgstr "Accetti i suddetti termini di licenza [s/N]? "
+#: openmamba-netsrpms:122
+msgid "$pckname installation in progress..."
+msgstr "Installazione di $pckname in corso..."
+#: openmamba-netsrpms:125
+msgid "rebuilding package \\`$SRPM_PATH'..."
+msgstr "ricreazione del pacchetto \\`$SRPM_PATH'..."
+#: openmamba-netsrpms:128
+msgid "error rebuilding \\`$SRPM_PATH'."
+msgstr "errore nella ricreazione di \\`$SRPM_PATH'."
+#: openmamba-netsrpms:129
+msgid "There was an error installing"
+msgstr "C'è stato un errore nell'installazione di"
+#: openmamba-netsrpms:140
+msgid "error installing \\`$RPM_PATH'."
+msgstr "errore nell'installazione di \\`$RPM_PATH'."
+#: openmamba-netsrpms:147
+msgid "Installation of $pckname successfully completed."
+msgstr "Installazione di $pckname completata con successo."
+#: openmamba-netsrpms:149
+msgid "There was an error installing $pckname!"
+msgstr "C'è stato un errore nell'installazione di $pckname!"
+#: openmamba-netsrpms:157
+msgid "Update needed."
+msgstr "Aggiornamento necessario."
+#: openmamba-update:28
+msgid ""
+"openmamba update script - version $VERSION\n"
+"Copyright (c) 2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+""
+msgstr ""
+"Script di aggiornamento di openmamba - versione $VERSION\n"
+"Copyright (c) 2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+""
+#: openmamba-update:38
+msgid ""
+"Usage: $script_name [OPTION][groupname ..]\n"
+"\n"
+"Options:\n"
+"  -f, --full\n"
+"    Perform a full update\n"
+"  -h, --help\n"
+"    Display this message.\n"
+"  -l, --list\n"
+"    List available groups and exit\n"
+"  -v, --verbose\n"
+"    Produce mode verbose output\n"
+"  -y, --assume-yes\n"
+"    Assume yes to all answers"
+msgstr ""
+"Uso: $script_name [OPZIONE][nomegruppo ..]\n"
+"\n"
+"Opzioni:\n"
+"  -f, --full\n"
+"    Effettua un aggiornamento completo\n"
+"  -h, --help\n"
+"    Mostra questo messaggio.\n"
+"  -l, --list\n"
+"    Elenca i gruppi disponibili ed esci\n"
+"  -v, --verbose\n"
+"    Produci un output dettagliato\n"
+"  -y, --assume-yes\n"
+"    Assumi 'si' a tutte le risposte"
+#: openmamba-update:80
+msgid "Available installation groups (*=installed,+=needs update):"
+msgstr "Gruppi di installazione disponibili (*=installato,+=richiede aggiornamento):"
+#: openmamba-update:120
+msgid "The following groups need to be updated: "
+msgstr "I seguenti gruppi necessitano di essere aggiornati: "
+#: openmamba-update:127
+msgid "Proceed with update [Y/n]?"
+msgstr "Procedere con l'aggiornamento [S/n]?"
+#: openmamba-update:143
+msgid "Installing: ${finalinstalllist[*]}"
+msgstr "Installazione: ${finalinstalllist[*]}"