Release 2.4.4

flashplugin update to 11.2.202.394
skype update to 4.3.0.37

Makefile

@@ -1,5 +1,5 @@
 # Makefile for desktop-base-openmamba package
-# Copyright (C) 2004-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2004-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 include VERSION
@@ -8,8 +8,10 @@ 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)
 
@@ -68,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
@@ -81,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 spotify
 
 pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
@@ -99,6 +100,7 @@ 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
@@ -119,13 +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,@spotifyver@,${SPOTIFY_VERSION},g;\
-            s,@skypever@,${SKYPE_VERSION},g" $< > $@
+            s,@screensaver@,${SCREENSAVER},g" $< > $@
 
 all: dist-update locales
 
@@ -157,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)
@@ -215,9 +218,9 @@ install-srpms:
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir)
 	@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
@@ -258,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

@@ -4,4 +4,4 @@
 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:       @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

SRPMS/spotify/spotify.spec.in

@@ -1,7 +1,7 @@
-%define spotify_make_ver 20130831git
+#% define spotify_make_ver 20130831git
 Name:          spotify
-Version:       @spotifyver@
-Release:       1mamba
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Summary:       Listen to music using Spotify
 Group:         Graphical Desktop/Applications/Multimedia
 Vendor:        @vendor@
@@ -9,7 +9,7 @@ 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-%{spotify_make_ver}.tar.bz2
+Source:        https://github.com/leamas/spotify-make.git/master/spotify-make-%{version}.zip
 Source1:       LICENSE
 License:       Not distributable
 ## AUTOBUILDREQ-BEGIN
@@ -19,10 +19,8 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 %description
 Listen to music using Spotify.
 
-%debug_package
-
 %prep
-%setup -q -n spotify-make-%{spotify_make_ver}
+%setup -q -n spotify-make-master
 
 %build
 ./configure \
@@ -39,9 +37,20 @@ 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
@@ -60,15 +69,16 @@ 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
 /opt/spotify/lib/spotify-client/*
-%{_datadir}/applications/spotify.desktop
-%{_datadir}/icons/hicolor/*/apps/spotify-client.png
+%dir /opt/spotify/share
 %dir /opt/spotify/share/spotify-client/
 /opt/spotify/share/spotify-client/*
 %{_mandir}/man1/spotify.1.gz

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

@@ -22,8 +22,8 @@
 %define        cgibindir         %{_var}/www/cgi-bin
 
 Name:          sun-java7
-Version:       @sunjava7ver@
-Release:       1@distroext@
+Version:       @SRPMVERSION@
+Release:       @SRPMRELEASE@
 Epoch:         1
 Summary:       Sun Java Developer's Kit
 Group:         System/Libraries/Java
@@ -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}-b15/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}-b15/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}-b15/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
@@ -534,8 +538,10 @@ fi
 %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
 
@@ -579,21 +585,31 @@ 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
 

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

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,6 +1,24 @@
-FLASHPLUGIN_VERSION=11.2.202.297
-WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=4.2.0.11
-VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u25
-SPOTIFY_VERSION=0.9.1.55.gbdd3b79.203
+# 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

@@ -1,5 +1,2 @@
-FLASHPLUGIN_VERSION=11.2.202.280
-WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=4.1.0.20
-VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u25
+SRPMVERSION["sun-java7"]=7u51
+SRPMRELEASE["sun-java7"]=2mamba

VERSION

@@ -1 +1 @@
-VERSION = 2.3.24
+VERSION = 2.4.4

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

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

@@ -149,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

openmamba-update/openmamba-netsrpms

@@ -2,10 +2,12 @@
 #
 # netsrpm-install.sh - Build srpms that download sources from network
 #
-# Copyright (C) 2003-2013 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)
@@ -16,14 +18,14 @@ while [ "$1" ]; do
       -f) FORCE_MODE=1 ;;
       -u) UPGRADE_MODE=1 ;;
       -h|--help) PACKAGES= ; break ;;
-      -*) echo "Error: invalid option $1; aborting."; exit 1 ;;
+      -*) echo $"Error: invalid option $1; aborting."; exit 1 ;;
       *) PACKAGES="$PACKAGES $1"
    esac
    shift
 done
 
 if [ -z "$PACKAGES" ]; then
-   echo "Usage:
+   echo $"Usage:
 $me [options...] pkgname ...
 
 Options:
@@ -41,22 +43,22 @@ function check_if_already_installed() {
    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=
@@ -65,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
@@ -76,42 +78,20 @@ 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
+      if [ -f ${SRPM_PATH}/LICENSE ]; then
          if [ "$DISPLAY" ]; then
-            license-dialog $tmpdir/LICENSE
+            license-dialog ${SRPM_PATH}/LICENSE
             [ $? -ne 0 ] && exit 1
          else
-            echo "You must accept the following license terms:"
+            echo $"You must accept the following license terms:"
             echo
-            more $tmpdir/LICENSE
-            echo -n "Do you agree with the above license terms [y/N]? "
+            more ${SRPM_PATH}/LICENSE
+            echo -n $"Do you agree with the above license terms [y/N]? "
             read ans
             [ "$ans" = "Y" -o "$ans" = "y" ] || exit 1
          fi
@@ -120,10 +100,28 @@ for pckname in $PACKAGES; do
       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
+         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
@@ -151,8 +149,8 @@ for pckname in $PACKAGES; do
    fi
 done
 
-[ "$UPDATE_NEEDED" ] && {
-   echo "Update needed."
+if [ "$CHECK_MODE" -a "$UPDATE_NEEDED" ]; then
+   echo $"Update needed."
    exit 1
-}
+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[*]}"