Release 2.3.18

This reverts commit 8bfb8d05d3.

Makefile

@@ -1,14 +1,16 @@
 # Makefile for openmamba-desktop-base
-# Copyright (C) 2004-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 include VERSION
 include SRPMSVERSIONS
 
 PACKAGE = desktop-base-openmamba
-
 DISTROID = openmamba
 
+WITHKDE3 := 1
+WITHKDE3TOOLS := 1
+
 RPM_VENDOR = openmamba
 RPM_DISTRIBUTION = openmamba
 RPM_DISTROEXT = mamba
@@ -25,6 +27,7 @@ SCREENSAVER =
 
 DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z)
 DISTROICON = $(DISTROid)
+ARCH=`uname -i`
 
 DESTDIR =
 
@@ -37,26 +40,23 @@ datadir = ${prefix}/share
 initrddir = ${sysconfdir}/rc.d/init.d
 mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
+xprofiledir = ${sysconfdir}/xprofile.d
 mambabasedatadir = ${datadir}/openmamba/mambabase
 mambareportdatadir = ${datadir}/openmamba/mambareport
 mambawelcomedatadir = ${datadir}/openmamba/mambawelcome
 mambaimagesdir = ${datadir}/openmamba/images
 xramdrdatadir = ${datadir}/openmamba/xramdr
 bootrecoverdatadir = ${datadir}/openmamba/bootrecover
-usbinstalldatadir = ${datadir}/openmamba/usbinstall
 iconsdir = ${datadir}/icons/hicolor
 kdeprefixdir = $(shell kde-config --prefix)
-kde4prefixdir = $(shell kde4-config --prefix)
 kdedatadir = $(kdeprefixdir)/share
-kde4bindir = $(kde4prefixdir)/bin
 kdeautostartdir = ${kdedatadir}/autostart
 kdeconfigdir = ${kdedatadir}/config
 kdewallpapersdir = ${kdedatadir}/wallpapers
 localesdir = ${datadir}/locale
 kdelocalesdir = ${kdedatadir}/locale
-aptconfdir = ${sysconfdir}/apt/apt.conf.d
-aptscriptsdir = ${datadir}/apt/scripts
-
+pck_desktop = $(wildcard desktop/*.bz2)
+systemlogodir = ${datadir}/pixmaps
 xdg_appsdir = ${datadir}/applications
 xdg_directorydir = ${datadir}/desktop-directories
 xdg_menudir = ${sysconfdir}/xdg/menus
@@ -65,7 +65,7 @@ xdg_mergedmenudir = $(xdg_menudir)/applications-merged
 distrorootdir = ${datadir}/$(DISTROid)
 distrobindir = ${distrorootdir}/bin
 distrosrpmsdir = ${distrorootdir}/SRPMS
-distrokdedir = ${distrorootdir}/kde
+distrodesktopdir = ${distrorootdir}/desktop
 srcdir = .
 
 INSTALL = /usr/bin/install
@@ -74,32 +74,34 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_DIR = ${INSTALL} -d -m 755
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-pck_kdedesktop = $(wildcard kde/desktop/*)
 #pck_srpms = flashplugin jre msttcorefonts win32codecs
-pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware
+pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack sun-java7
 
 pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
                           kde/wallpapers/*.in \
                           menu/*.in menu/applications/*.in menu/applications/*/*.in \
-                          SRPMS/*/*.in)
+                          SRPMS/*/*.in \
+                          desktop/*.in)
 pck_sysconfigfile := distroutils.sysconfig
 
 distdir = $(PACKAGE)-$(VERSION)
 dist_archive = $(distdir).tar.bz2
 
+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 usbinstall/po/*.po)
 
 .SUFFIXES:
 .SUFFIXES: .in .po .mo
 
 .in:; @echo "generating $@..."; \
+       if [ "$(ARCH)" != "x86_64" ]; 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;\
@@ -107,12 +109,14 @@ pck_catalogs3 := $(wildcard usbinstall/po/*.po)
             s,@datadir@,${datadir},g;\
             s,@bindir@,$(bindir),g;\
             s,@distrobindir@,$(distrobindir),g;\
-            s,@distrokdedir@,$(distrokdedir),g;\
+            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" $< > $@
 
 all: dist-update locales
@@ -145,13 +149,6 @@ 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)$(localesdir)/$$lang/LC_MESSAGES";\
-	   $(INSTALL_DIR) $$dir;\
-	   $(INSTALL_DATA) $${f/.po/.mo} $$dir/usbinstall.mo;\
-	done
 
 install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
@@ -159,16 +156,20 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(datadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
-	@$(INSTALL_DIR) $(DESTDIR)$(kde4bindir)
+ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
+endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
+	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
+ifeq ($(WITHKDE3),1)
 	cp -r kde/apps $(DESTDIR)$(kdedatadir)
 	$(INSTALL_DATA) kde/autostart/kmix.desktop $(DESTDIR)$(kdeautostartdir)/kmix.desktop
 	$(INSTALL_DATA) kde/config/*rc $(DESTDIR)$(kdeconfigdir)/
@@ -176,8 +177,8 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
+endif
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
-#	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
 install-distromenu: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
@@ -210,38 +211,53 @@ install-srpms:
 	done
 
 install-icons:
+	@$(INSTALL_DIR) $(DESTDIR)$(systemlogodir)/; \
+	$(INSTALL_DATA) mambabase/mamba-64x64.png $(DESTDIR)$(systemlogodir)/system-logo-white.png
 	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
 	   $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \
+	done
+ifeq ($(WITHKDE3TOOLS),1)
+	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DATA) mambawelcome/mambawelcome-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambawelcome.png; \
-#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png; \
 	   $(INSTALL_DATA) bootrecover/bootrecover-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/bootrecover.png; \
 	done
+endif
+#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png \
 
 install-mambabase:
 	@$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
-	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.db $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_SCRIPT) mambabase/mambabase.sh $(DESTDIR)$(mambabasedatadir)
+ifeq ($(WITHKDE3TOOLS),1)
+	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir)
 	$(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir)
+endif
 
 install-mambareport:
+	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
+ifeq ($(WITHKDE3TOOLS),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambareportdatadir)
 	$(INSTALL_SCRIPT) mambareport/mambareport.kmdr $(DESTDIR)$(mambareportdatadir)
-	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
 	$(INSTALL_DATA) mambareport/mambareport.desktop $(DESTDIR)$(xdg_appsdir)
+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_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_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
+endif
 
 install-xramdr:
 	@$(INSTALL_DIR) $(DESTDIR)$(xramdrdatadir)
@@ -250,20 +266,16 @@ install-xramdr:
 
 install-bootrecover:
 	@$(INSTALL_DIR) $(DESTDIR)$(bootrecoverdatadir)
-	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_SCRIPT) bootrecover/bootrecover.sh $(DESTDIR)$(bootrecoverdatadir)
+ifeq ($(WITHKDE3TOOLS),1)
+	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir)
+endif
 
-install-apt-extras:
-	@$(INSTALL_DIR) $(DESTDIR)$(aptconfdir) $(DESTDIR)$(aptscriptsdir)
-	$(INSTALL_DATA) apt/post-install.conf $(DESTDIR)$(aptconfdir)
-	$(INSTALL_SCRIPT) apt/post-install.lua $(DESTDIR)$(aptscriptsdir)
-	$(INSTALL_SCRIPT) apt/post-install.sh $(DESTDIR)$(aptscriptsdir)
-
-install-usbinstall:
-	@$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir)
-	$(INSTALL_SCRIPT) usbinstall/usbinstall.sh $(DESTDIR)$(usbinstalldatadir)
-	$(INSTALL_DATA) usbinstall/usbinstall.desktop $(DESTDIR)$(xdg_appsdir)
+install-desktop:
+	@$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir)
+	$(INSTALL_DATA) $(pck_desktop) $(DESTDIR)$(distrodesktopdir)
+	$(INSTALL_SCRIPT) desktop/desktop-firsttime.sh $(DESTDIR)$(xprofiledir)
 
 install-openmamba-update:
 	@$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -274,15 +286,14 @@ install: $(pck_infiles:.in=) \
 	install-kde-distro-addons \
 	install-distromenu \
 	install-srpms \
+	install-desktop \
+	install-openmamba-update \
 	install-mambabase \
 	install-mambawelcome \
 	install-mambareport \
-	install-usbinstall \
-	install-openmamba-update \
 	install-bootrecover \
 	install-locales \
-	install-icons \
-	install-apt-extras
+	install-icons
 
 dist: clean
 	@git log > ChangeLog.git

SRPMS/flashplugin/distroutils.sysconfig

@@ -1,13 +0,0 @@
-## Adobe Flash Plugin
-
-# package name (do not modify unless you know what you're doing)
-#FLASH_PLUGIN_PCK=flashplayer9_install_linux_082207.tar.gz
-#FLASH_PLUGIN_PCK=flash-player-plugin-9.0.48.0.tar.bz2
-#FLASH_PLUGIN_PCK=install_flash_player_9_linux.tar.gz
-FLASH_PLUGIN_PCK=install_flash_player_10_linux.tar.gz
-
-# package URL (do not modify unless you know what you're doing)
-#FLASH_PLUGIN_URL=http://download.macromedia.com/pub/labs/flashplayer9_update/
-#FLASH_PLUGIN_URL=http://macromedia.rediris.es/rpmsource/
-#FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/current/
-FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/current/

SRPMS/flashplugin/distroutils.sysconfig.in

@@ -0,0 +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.@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}/

SRPMS/msttcorefonts/distroutils.sysconfig

@@ -7,14 +7,4 @@ HAS_MS_LICENSE=no
 
 # Select the server that is closest to you by removing the '#'
 # character in one of the following lines:
-MSTTCF_URL=http://mesh.dl.sourceforge.net/project/corefonts/the%20fonts/final/
-#MSTTCF_URL=http://aleron.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://belnet.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://cesnet.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://flow.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://switch.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://twtelecom.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://unc.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://umn.dl.sourceforge.net/sourceforge/corefonts
-#MSTTCF_URL=http://easynews.dl.sourceforge.net/sourceforge/corefonts/
-
+MSTTCF_URL=http://downloads.sourceforge.net/project/corefonts/the%20fonts/final

SRPMS/skype/distroutils.sysconfig

@@ -1,8 +1,8 @@
 ## Skype
 
 # package name (do not modify unless you know what you're doing)
-#SKYPE_PCK=skype-2.0.0.68.tar.bz2
+#SKYPE_PCK=skype-4.0.0.7.tar.bz2
 
 # package URL (do not modify unless you know what you're doing)
 #SKYPE_URL=http://download.skype.com/linux/
-SKYPE_URL=http://www.skype.com/go/getskype-linux-dynamic
+SKYPE_URL=http://www.skype.com/go/getskype-linux-beta-dynamic

SRPMS/skype/skype.spec.in

@@ -1,13 +1,13 @@
 Name:          skype
 Version:       @skypever@
-Release:       2@distroext@
+Release:       @distroext@
 Epoch:         1
 Summary:       An Internet voice and video communication software
 Group:         Graphical Desktop/Applications/Internet
 Vendor:        @vendor@
 Distribution:  @distribution@
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://macromedia.rediris.es/
+URL:           http://www.skype.com
 Source:        LICENSE
 License:       Non Distributable
 BuildPrereq:   wget
@@ -38,15 +38,11 @@ tmpdir=$(mktemp -q -d -t skype.XXXXXXXX)
 
 wget -nv --timeout=10 --tries=2 \
    ${SKYPE_URL}${SKYPE_PCK} -P ${tmpdir}
-   
-SKYPE_ARCHIVE="`ls ${tmpdir}/skype-*`"
+
+SKYPE_ARCHIVE="`ls ${tmpdir}/*skype-* 2>/dev/null`"
 [ -f ${SKYPE_ARCHIVE} ] || exit 1
 
-if [ `echo ${SKYPE_ARCHIVE} | grep "tar.bz2$"` ]; then   
-   tar xjf ${SKYPE_ARCHIVE} --strip-components=1
-else
-   tar xzf ${SKYPE_ARCHIVE} --strip-components=1
-fi
+tar xf ${SKYPE_ARCHIVE} --strip-components=1
 
 %build -q
 
@@ -68,6 +64,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}
 
@@ -75,6 +102,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
@@ -84,7 +113,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/sun-java7/LICENSE

@@ -0,0 +1,68 @@
+Oracle Binary Code License Agreement for the Java SE Platform Products and JavaFX 
+
+ORACLE AMERICA, INC. ("ORACLE"), FOR AND ON BEHALF OF ITSELF AND ITS SUBSIDIARIES AND AFFILIATES UNDER COMMON CONTROL, IS WILLING TO LICENSE THE SOFTWARE TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS BINARY CODE LICENSE AGREEMENT AND SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT"). PLEASE READ THE AGREEMENT CAREFULLY. BY SELECTING THE "ACCEPT LICENSE AGREEMENT" (OR THE EQUIVALENT) BUTTON AND/OR BY USING THE SOFTWARE YOU ACKNOWLEDGE THAT YOU HAVE READ THE TERMS AND AGREE TO THEM. IF YOU ARE AGREEING TO THESE TERMS ON BEHALF OF A COMPANY OR OTHER LEGAL ENTITY, YOU REPRESENT THAT YOU HAVE THE LEGAL AUTHORITY TO BIND THE LEGAL ENTITY TO THESE TERMS. IF YOU DO NOT HAVE SUCH AUTHORITY, OR IF YOU DO NOT WISH TO BE BOUND BY THE TERMS, THEN SELECT THE "DECLINE LICENSE AGREEMENT" (OR THE EQUIVALENT) BUTTON AND YOU MUST NOT USE THE SOFTWARE ON THIS SITE OR ANY OTHER MEDIA ON WHICH THE SOFTWARE IS CONTAINED. 
+
+1. DEFINITIONS. "Software" means the software identified above in binary form that you selected for download, install or use (in the version You selected for download, install or use) from Oracle or its authorized licensees, any other machine readable materials (including, but not limited to, libraries, source files, header files, and data files), any updates or error corrections provided by Oracle, and any user manuals, programming guides and other documentation provided to you by Oracle under this Agreement. "General Purpose Desktop Computers and Servers" means computers, including desktop and laptop computers, or servers, used for general computing functions under end user control (such as but not specifically limited to email, general purpose Internet browsing, and office suite productivity tools). The use of Software in systems and solutions that provide dedicated functionality (other than as mentioned above) or designed for use in embedded or function-specific software applications, for example but not limited to: Software embedded in or bundled with industrial control systems, wireless mobile telephones, wireless handheld devices, kiosks, TV/STB, Blu-ray Disc devices, telematics and network control switching equipment, printers and storage management systems, and other related systems are excluded from this definition and not licensed under this Agreement. "Programs" means (a) Java technology applets and applications intended to run on the Java Platform, Standard Edition platform on Java-enabled General Purpose Desktop Computers and Servers; and (b) JavaFX technology applications intended to run on the JavaFX Runtime on JavaFX-enabled General Purpose Desktop Computers and Servers. “Commercial Features” means those features identified in Table 1-1 (Commercial Features In Java SE Product Editions) of the Java SE documentation accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html. “README File” means the README file for the Software accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html. 
+
+2. LICENSE TO USE. Subject to the terms and conditions of this Agreement including, but not limited to, the Java Technology Restrictions of the Supplemental License Terms, Oracle grants you a non-exclusive, non-transferable, limited license without license fees to reproduce and use internally the Software complete and unmodified for the sole purpose of running Programs. THE LICENSE SET FORTH IN THIS SECTION 2 DOES NOT EXTEND TO THE COMMERCIAL FEATURES. YOUR RIGHTS AND OBLIGATIONS RELATED TO THE COMMERCIAL FEATURES ARE AS SET FORTH IN THE SUPPLEMENTAL TERMS ALONG WITH ADDITIONAL LICENSES FOR DEVELOPERS AND PUBLISHERS. 
+
+3. RESTRICTIONS. Software is copyrighted. Title to Software and all associated intellectual property rights is retained by Oracle and/or its licensors. Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software. You acknowledge that the Software is developed for general use in a variety of information management applications; it is not developed or intended for use in any inherently dangerous applications, including applications that may create a risk of personal injury. If you use the Software in dangerous applications, then you shall be responsible to take all appropriate fail-safe, backup, redundancy, and other measures to ensure its safe use. Oracle 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 Oracle or its licensors is granted under this Agreement. Additional restrictions for developers and/or publishers licenses are set forth in the Supplemental License Terms. 
+
+4. DISCLAIMER OF WARRANTY. THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. ORACLE FURTHER DISCLAIMS ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. 
+
+5. LIMITATION OF LIABILITY. IN NO EVENT SHALL ORACLE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ORACLE'S ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000). 
+
+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 Oracle if you fail to comply with any provision of this Agreement. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. Upon termination, you must destroy all copies of Software. 
+
+7. EXPORT REGULATIONS. You agree that U.S. export control laws and other applicable export and import laws govern your use of the Software, including technical data; additional information can be found on Oracle's Global Trade Compliance web site (http://www.oracle.com/products/export). You agree that neither the Software nor any direct product thereof will be exported, directly, or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation. 
+
+8. TRADEMARKS AND LOGOS. You acknowledge and agree as between you
+and Oracle that Oracle owns the ORACLE and JAVA trademarks and all ORACLE- and JAVA-related trademarks, service marks, logos and other brand
+designations ("Oracle Marks"), and you agree to comply with the Third
+Party Usage Guidelines for Oracle Trademarks currently located at
+http://www.oracle.com/us/legal/third-party-trademarks/index.html . Any use you make of the Oracle Marks inures to Oracle's benefit. 
+
+9. U.S. GOVERNMENT LICENSE 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 shall be only those set forth in this Agreement. 
+
+10. GOVERNING LAW. This agreement is governed by the substantive and procedural laws of California. You and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts of San Francisco, or Santa Clara counties in California in any dispute arising out of or relating to this agreement. 
+
+11. 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. 
+
+12. INTEGRATION. This Agreement is the entire agreement between you and Oracle 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. 
+
+SUPPLEMENTAL LICENSE TERMS 
+
+These Supplemental License Terms add to or modify the terms of the Binary Code License Agreement. Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Binary Code License Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Binary Code License Agreement, or in any license contained within the Software. 
+
+A. COMMERCIAL FEATURES. You may not use the Commercial Features for running Programs, Java applets or applications in your internal business operations or for any commercial or production purpose, or for any purpose other than as set forth in Sections B, C, D and E of these Supplemental Terms. If You want to use the Commercial Features for any purpose other than as permitted in this Agreement, You must obtain a separate license from Oracle. 
+
+B. SOFTWARE INTERNAL USE FOR DEVELOPMENT LICENSE GRANT. Subject to the terms and conditions of this Agreement and restrictions and exceptions set forth in the README File incorporated herein by reference, including, but not limited to the Java Technology Restrictions of these Supplemental Terms, Oracle grants you a non-exclusive, non-transferable, limited license without fees to reproduce internally and use internally the Software complete and unmodified for the purpose of designing, developing, and testing your Programs. 
+
+C. LICENSE TO DISTRIBUTE SOFTWARE. Subject to the terms and conditions of this Agreement and restrictions and exceptions set forth in the README File, including, but not limited to the Java Technology Restrictions and Limitations on Redistribution of these Supplemental Terms, Oracle grants you a non-exclusive, non-transferable, limited license without fees to reproduce and distribute the Software, provided that (i) you distribute the Software complete and unmodified and only bundled as part of, and for the sole purpose of running, your Programs, (ii) the Programs add significant and primary functionality to the Software, (iii) you do not distribute additional software intended to replace any component(s) of the Software, (iv) you do not remove or alter any proprietary legends or notices contained in the Software, (v) you only distribute the Software subject to a license agreement that: (a) is a complete, unmodified reproduction of this Agreement; or (b) protects Oracle's interests consistent with the terms contained in this Agreement and that includes the notice set forth in Section H, and (vi) you agree to defend and indemnify Oracle 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. The license set forth in this Section C does not extend to the Software identified in Section G. 
+
+D. LICENSE TO DISTRIBUTE REDISTRIBUTABLES. Subject to the terms and conditions of this Agreement and restrictions and exceptions set forth in the README File, including but not limited to the Java Technology Restrictions and Limitations on Redistribution of these Supplemental Terms, Oracle grants you a non-exclusive, non-transferable, limited license without fees to reproduce and distribute those files specifically identified as redistributable in the README File ("Redistributables") provided that: (i) you distribute the Redistributables complete and unmodified, and only bundled as part of Programs, (ii) the Programs add significant and primary functionality to the Redistributables, (iii) you do not distribute additional software intended to supersede any component(s) of the Redistributables (unless otherwise specified in the applicable README File), (iv) you do not remove or alter any proprietary legends or notices contained in or on the Redistributables, (v) you only distribute the Redistributables pursuant to a license agreement that: (a) is a complete, unmodified reproduction of this Agreement; or (b) protects Oracle's interests consistent with the terms contained in the Agreement and includes the notice set forth in Section H, (vi) you agree to defend and indemnify Oracle 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. The license set forth in this Section D does not extend to the Software identified in Section G. 
+
+E. DISTRIBUTION BY PUBLISHERS. This section pertains to your distribution of the JavaTM SE Development Kit Software (“JDK”) with your printed book or magazine (as those terms are commonly used in the industry) relating to Java technology ("Publication"). Subject to and conditioned upon your compliance with the restrictions and obligations contained in the Agreement, Oracle hereby grants to you a non-exclusive, nontransferable limited right to reproduce complete and unmodified copies of the JDK on electronic media (the "Media") for the sole purpose of inclusion and distribution with your Publication(s), subject to the following terms: (i) You may not distribute the JDK on a stand-alone basis; it must be distributed with your Publication(s); (ii) You are responsible for downloading the JDK from the applicable Oracle web site; (iii) You must refer to the JDK as JavaTM SE Development Kit; (iv) The JDK must be reproduced in its entirety and without any modification whatsoever (including with respect to all proprietary notices) and distributed with your Publication subject to a license agreement that is a complete, unmodified reproduction of this Agreement; (v) The Media label shall include the following information: “Copyright [YEAR], Oracle America, Inc. All rights reserved. Use is subject to license terms. ORACLE and JAVA trademarks and all ORACLE- and JAVA-related trademarks, service marks, logos and other brand designations are trademarks or registered trademarks of Oracle in the U.S. and other countries.” [YEAR] is the year of Oracle's release of the Software; the year information can typically be found in the Software’s “About” box or screen. This information must be placed on the Media label in such a manner as to only apply to the JDK; (vi) You must clearly identify the JDK as Oracle's product on the Media holder or Media label, and you may not state or imply that Oracle is responsible for any third-party software contained on the Media; (vii) You may not include any third party software on the Media which is intended to be a replacement or substitute for the JDK; (viii) You agree to defend and indemnify Oracle 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 the JDK and/or the Publication; ; and (ix) You shall provide Oracle with a written notice for each Publication; such notice shall include the following information: (1) title of Publication, (2) author(s), (3) date of Publication, and (4) ISBN or ISSN numbers. Such notice shall be sent to Oracle America, Inc., 500 Oracle Parkway, Redwood Shores, California 94065 U.S.A , Attention: General Counsel. 
+
+F. JAVA TECHNOLOGY RESTRICTIONS. You may not create, modify, or change the behavior of, or authorize your licensees to create, modify, or change the behavior of, classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun", “oracle” or similar convention as specified by Oracle in any naming convention designation. 
+
+G. LIMITATIONS ON REDISTRIBUTION. You may not redistribute or otherwise transfer: (a) JavaFX Runtime prior to version 2.0.2, (b) JavaFX Development Kit prior to version 2.0.2, or (c) any and all patches, bug fixes and updates made available by Oracle through Oracle Premier Support, including those made available under Oracle's Java SE Support program. 
+
+H. COMMERCIAL FEATURES NOTICE. For purpose of complying with Supplemental Term Section C.(v)(b) and D.(v)(b), your license agreement shall include the following notice, where the notice is displayed in a manner that anyone using the Software will see the notice: 
+
+Use of the Commercial Features for any commercial or production purpose requires a separate license from Oracle. “Commercial Features” means those features identified Table 1-1 (Commercial Features In Java SE Product Editions) of the Java SE documentation accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html  
+
+I. SOURCE CODE. Software may contain source code that, unless expressly licensed for other purposes, is provided solely for reference purposes pursuant to the terms of this Agreement. Source code may not be redistributed unless expressly provided for in this Agreement. 
+
+J. THIRD PARTY CODE. Additional copyright notices and license terms applicable to portions of the Software are set forth in the THIRDPARTYLICENSEREADME file accessible at http://www.oracle.com/technetwork/java/javase/documentation/index.html. In addition to any terms and conditions of any third party opensource/freeware license identified in the THIRDPARTYLICENSEREADME file, the disclaimer of warranty and limitation of liability provisions in paragraphs 4 and 5 of the Binary Code License Agreement shall apply to all Software in this distribution. 
+
+K. TERMINATION FOR INFRINGEMENT. Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 
+
+L. INSTALLATION AND AUTO-UPDATE. The Software's installation and auto-update processes transmit a limited amount of data to Oracle (or its service provider) about those specific processes to help Oracle understand and optimize them. Oracle does not associate the data with personally identifiable information. You can find more information about the data Oracle collects as a result of your Software download at http://www.oracle.com/technetwork/java/javase/documentation/index.html.
+
+For inquiries please contact: 
+Oracle America, Inc., 500 Oracle Parkway,
+Redwood Shores, California 94065, USA. 
+
+Last updated 2 July 2012
+

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

@@ -0,0 +1,721 @@
+%define        JRE_NSVER         7
+
+%define        MAJOR             %(echo %version | cut -du -f1)
+%define        MINOR             %(echo %version | cut -du -f2)
+%define        major             1.%{MAJOR}
+%define        minor             0
+%define        origin            sun
+%define        javaver           %{major}.%{minor}
+%define        jppname           java-%{javaver}-%{origin}
+%define        javaws_ver        %{javaver}
+%define        toplevel_dir      jdk%{javaver}_06
+%define        distversion       %{version}
+%define        label             -%{name}
+%define        jdklnk            jdk7-%{origin}
+%define        jrelnk            jre7-%{origin}
+%define        jdkdir            %{jppname}
+%define        jredir            %{jdkdir}/jre
+%define        jdkbindir         %{_jvmdir}/%{jdklnk}/bin
+%define        jdklibdir         %{_jvmdir}/%{jdklnk}/lib
+%define        jrebindir         %{_jvmdir}/%{jrelnk}/bin
+%define        jvmjardir         %{_jvmjardir}/%{jppname}
+%define        cgibindir         %{_var}/www/cgi-bin
+
+Name:          sun-java7
+Version:       @sunjava7ver@
+Release:       2@distroext@
+Epoch:         1
+Summary:       Sun Java Developer's Kit
+Group:         System/Libraries/Java
+Vendor:        openmamba
+Distribution:  openmamba
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://www.oracle.com/technetwork/java/javase/overview/index.html
+Source:        LICENSE
+#Source0:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-i586.tar.gz
+#Source1:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-x64.tar.gz
+#Source2:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-arm-sfp.tar.gz
+#Source3:       sun-java7-jdk-profile
+#Source4:       sun-java7-jre-profile
+BuildRequires: jpackage-utils
+Provides:      jdk = %{version}
+Provides:      jdk2 = %{version}
+License:       Oracle Binary Code License
+Requires:      shared-mime-info
+Requires:      desktop-file-utils
+Requires:      sun-java7-runtime = %{epoch}:%{version}-%{release}
+Requires:      menu-java
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+Sun Java Developer's Kit.
+
+%package runtime
+Summary:       Sun Java Platform Runtime Environment
+Group:         System/Libraries/Java
+Obsoletes:     j2re
+Provides:      j2re = %{version}
+Provides:      jre = %{version}
+
+%description runtime
+Sun Java Platform Runtime Environment.
+
+%prep
+[ "%{toplevel_dir}" != / ] && rm -rf "%{toplevel_dir}"
+
+%setup -q -T -c
+
+#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
+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
+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
+tar xf jdk-%{version}-linux-arm-sfp.tar.gz
+%endif
+
+cd %{toplevel_dir}
+#cp %{SOURCE5} ./construct.sh
+#mkdir unbundle-jdk
+#cd unbundle-jdk
+#sh %{SOURCE0} --accept-license
+chmod -R u+w *
+
+#for pack in $(find . -name "*.pack"); do
+#   bin/unpack200 $pack $(echo $pack | sed -e s:.pack::g).jar
+#done
+
+%install
+cd %{toplevel_dir}
+#construct.sh unbundle-jdk linux-jdk linux-jre
+install -d -m 755 %{buildroot}%{_jvmdir}/%{jdkdir}
+install -d -m 755 %{buildroot}%{_jvmdir}/%{jredir}
+
+cat > bin/HtmlConverter << EOF
+%{jrebindir}/java -jar %{jdklibdir}/htmlconverter.jar $*
+EOF
+
+sed -i "s|PATH=.*|PATH=%{jrebindir}|" bin/java-rmi.cgi
+# main 
+cp -a bin include lib src.zip %{buildroot}%{_jvmdir}/%{jdkdir}
+# extensions
+install -d -m 755 %{buildroot}%{jvmjardir}
+
+pushd %{buildroot}%{jvmjardir}
+
+   ln -s %{_jvmdir}/%{jredir}/lib/jsse.jar jsse-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/jce.jar jce-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar jndi-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar jndi-ldap-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar jndi-cos-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar jndi-rmi-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar jaas-%{javaver}.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar jdbc-stdext-%{javaver}.jar
+   ln -s jdbc-stdext-%{javaver}.jar jdbc-stdext-3.0.jar
+   ln -s %{_jvmdir}/%{jredir}/lib/rt.jar sasl-%{javaver}.jar
+#  ln -s %{_jvmdir}/%{jredir}/lib/rt.jar xml-commons-apis.jar
+   for jar in *-%{javaver}.jar ; do
+      #if [ %{version} != %{javaver} ]; then
+         #ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|-%{javaver}.jar|g")
+      #fi
+      ln -fs ${jar} $(echo $jar | sed "s|-%{javaver}.jar|.jar|g")
+   done
+
+popd
+
+# rest of jre
+cp -a jre/bin jre/lib %{buildroot}%{_jvmdir}/%{jredir}
+#cp -a jre/javaws %{buildroot}%{_jvmdir}/%{jredir}
+%ifnarch arm
+cp -a jre/plugin %{buildroot}%{_jvmdir}/%{jredir}
+%endif
+
+# see <http://www.java.com/it/download/help/5000010500.xml#install>
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/icons/mini
+%ifnarch arm
+install -m 644 jre/plugin/desktop/%{origin}_java.png \
+   %{buildroot}%{_datadir}/pixmaps/%{name}.png
+ln -s %{_datadir}/pixmaps/%{name}.png %{buildroot}%{_datadir}/icons/mini/%{name}.png
+
+install -d %{buildroot}%{_libdir}/mozilla/plugins
+pushd %{buildroot}%{_jvmdir}/%{jredir}
+ln -s %{_jvmdir}/%{jredir}/plugin/i386/ns%{JRE_NSVER}/libjavaplugin_oji.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin_oji.so
+ln -s %{_jvmdir}/%{jredir}/plugin/i386/ns%{JRE_NSVER}/libjavaplugin_oji.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin.so
+ln -s %{_jvmdir}/%{jredir}/lib/i386/libjavaplugin_jni.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin_jni.so
+ln -s %{_jvmdir}/%{jredir}/lib/i386/libjavaplugin_nscp.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin_nscp.so
+ln -s %{_jvmdir}/%{jredir}/lib/i386/libnpjp2.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libnpjp2-7.so
+popd
+%endif
+
+install -d -m 755 %{buildroot}%{_jvmprivdir}/%{name}/jce/vanilla
+for file in local_policy.jar US_export_policy.jar; do
+   mv %{buildroot}%{_jvmdir}/%{jredir}/lib/security/$file \
+      %{buildroot}%{_jvmprivdir}/%{name}/jce/vanilla
+   # for ghosts
+   touch %{buildroot}%{_jvmdir}/%{jredir}/lib/security/$file
+done
+
+pushd %{buildroot}%{_jvmdir}
+   ln -s %{jredir} %{jrelnk}
+   ln -s %{jdkdir} %{jdklnk}
+popd
+
+pushd %{buildroot}%{_jvmjardir}
+   ln -s %{jdkdir} %{jrelnk}
+   ln -s %{jdkdir} %{jdklnk}
+popd
+
+mkdir -p %{buildroot}%{_mandir}/man1
+for manpage in man/man1/*; do
+   install -m 644 -p $manpage \
+      %{buildroot}%{_mandir}/man1/`basename $manpage .1`-%{origin}7.1
+done
+
+
+mkdir -p %{buildroot}%{_jvmdir}/%{jdkdir}
+#cp -a demo sample %{buildroot}%{_jvmdir}/%{jdkdir}
+
+
+mkdir -p %{buildroot}%{_datadir}/mime/packages/
+mkdir -p %{buildroot}%{_datadir}/applications
+
+%ifnarch arm
+for style in hicolor HighContrast HighContrastInverse LowContrast; do
+   for size in 16 48; do
+      for kind in apps mimetypes; do
+         mkdir -p %{buildroot}%{_datadir}/icons/$style/${size}x${size}/$kind
+         install -m 644 jre/lib/desktop/icons/$style/${size}x${size}/$kind/*.png \
+            %{buildroot}%{_datadir}/icons/$style/${size}x${size}/$kind
+      done
+   done
+done
+
+rm -rf %{buildroot}%{_datadir}/icons/hicolor/48x48/mimetypes/gnome-mime-text-x-java.png
+rm -rf %{buildroot}%{_datadir}/icons/hicolor/16x16/mimetypes/gnome-mime-text-x-java.png
+
+cp -a jre/lib/desktop/mime/packages/* %{buildroot}%{_datadir}/mime/packages/
+cp -a jre/lib/desktop/applications/%{origin}-java.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+mkdir -p %{buildroot}%{_datadir}/applications
+if [ -e %{buildroot}%{_jvmdir}/%{jdkdir}/bin/jvisualvm ]; then
+cat >> %{buildroot}%{_datadir}/applications/%{name}-jvisualvm.desktop << EOF
+[Desktop Entry]
+Name=Java VisualVM (%{name})
+Comment=Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool
+Exec=%{_jvmdir}/%{jdkdir}/bin/jvisualvm
+Icon=%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+Terminal=false
+Type=Application
+Categories=Development;Profiling;
+EOF
+fi
+
+# ControlPanel freedesktop.org menu entry
+cat > %{buildroot}%{_datadir}/applications/%{name}-jcontrol.desktop << EOF
+[Desktop Entry]
+Name=Java Plugin Control Panel (%{name})
+Comment=Java Control Panel
+Exec=%{_jvmdir}/%{jdkdir}/bin/jcontrol
+Icon=%{_datadir}/icons/hicolor/48x48/apps/sun-jcontrol.png
+Terminal=false
+Type=Application
+Categories=Settings;Java;
+EOF
+
+# javaws freedesktop.org menu entry
+cat > %{buildroot}%{_datadir}/applications/%{name}-javaws.desktop << EOF
+[Desktop Entry]
+Name=Java Web Start (%{name})
+Comment=Java Application Launcher
+MimeType=application/x-java-jnlp-file;
+Exec=%{_jvmdir}/%{jredir}/bin/javaws %%u
+Icon=%{_datadir}/icons/hicolor/48x48/apps/sun-javaws.png
+Terminal=false
+Type=Application
+Categories=Settings;Java;
+EOF
+%endif
+
+mkdir -p %{buildroot}%{_datadir}/fonts/ttf/j2se-%{origin}
+mkdir -p %{buildroot}%{_datadir}/fonts/ttf/j2se-%{origin}-oblique
+
+# move the fonts into a shared fonts directory
+install -m 644 jre/lib/fonts/*.ttf \
+	%{buildroot}%{_datadir}/fonts/ttf/j2se-%{origin}
+install -m 644 jre/lib/oblique-fonts/*.ttf \
+	%{buildroot}%{_datadir}/fonts/ttf/j2se-%{origin}-oblique
+
+rm -rf %{buildroot}%{_jvmdir}/%{jredir}/lib/fonts
+rm -rf %{buildroot}%{_jvmdir}/%{jredir}/lib/oblique-fonts
+ln -s ../../../../../share/fonts/ttf/j2se-%{origin} \
+   %{buildroot}%{_jvmdir}/%{jredir}/lib/fonts
+ln -s ../../../../../share/fonts/ttf/j2se-%{origin}-oblique \
+   %{buildroot}%{_jvmdir}/%{jredir}/lib/oblique-fonts
+
+#install -d %{buildroot}%{_sysconfdir}/profile.d
+#sed -i "s|__JDK__PREFIX__|%{_jvmdir}|" %{S:3}
+#sed -i "s|__JRE__PREFIX__|%{_jvmdir}%{jrelnk}|" %{S:4}
+#install -m0755 %{S:3} %{buildroot}%{_sysconfdir}/profile.d/%{jdklnk}.sh
+#install -m0755 %{S:4} %{buildroot}%{_sysconfdir}/profile.d/%{jrelnk}.sh
+
+mkdir %{buildroot}%{_javadir}-%{javaver}
+mkdir %{buildroot}%{_jnidir}-%{javaver}
+
+## FIXME: temporary workaround to provide openjdk (required by ooobuild-3.1.0.6 odk patch)
+#ln -s  %{jdkdir} %{buildroot}%{_libdir}/jvm/java-%{MAJOR}-openjdk
+
+pushd %{buildroot}%{_jvmdir}/%{jredir}/lib
+for l in *.jar; do
+ln -s ../jre/lib/$l %{buildroot}%{_jvmdir}/%{jdkdir}/lib/$l
+done
+
+install -d -m 0755 %{buildroot}%{_jvmdir}/%{jredir}/.systemPrefs
+touch %{buildroot}%{_jvmdir}/%{jredir}/.systemPrefs/.systemRootModFile
+
+#for file in %{buildroot}%{_jvmdir}/%{jdkdir}/bin/* %{buildroot}%{_jvmdir}/%{jredir}/bin/*
+#do
+#   chrpath --list $file && chrpath --delete $file || :
+#done
+#for file in $(find %{buildroot}%{_jvmdir}/%{jdkdir}/demo -name "*.so")
+#do
+#   chrpath --list $file && chrpath --delete $file || :
+#done
+#for file in $(find %{buildroot}%{_jvmdir}/%{jredir}/lib -name "*.so")
+#do
+#   chrpath --list $file && chrpath --delete $file || :
+#done
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+%pre
+if [ $1 -ge 1 ]; then
+   # legacy cleanups
+   for b in javac jar; do
+      /usr/sbin/update-alternatives --remove $b \
+         /opt/java/jdk/bin/$b  2>/dev/null
+   done
+fi
+:
+
+%post
+if [ $1 -ge 1 ]; then
+   # new install
+   if ! echo ${PATH} | grep -q %{_jredir}/bin; then
+      export PATH="$PATH:%{_jredir}/bin"
+   fi
+   for b in javac jar; do
+      [ -L %{_bindir}/$b -a "`readlink %{_bindir}/$b`" != "%{_sysconfdir}/alternatives/$b" ] &&
+         rm -f %{_bindir}/$b
+      %{_sbindir}/update-alternatives \
+         --install %{_bindir}/$b $b \
+         %{_jvmdir}/%{jdklnk}/bin/$b 56
+   done
+   %{_sbindir}/update-alternatives \
+      --install %{_jvmdir}/jdk jdk \
+      %{_jvmdir}/%{jdklnk} 56
+   %{_sbindir}/update-alternatives \
+      --install %{_jvmjardir}/jdk jdk-exports \
+      %{_jvmjardir}/%{jdklnk} 56
+fi
+:
+
+%preun
+if [ $1 -eq 0 ]; then
+   for b in javac jar; do
+      %{_sbindir}/update-alternatives --remove $b \
+         %{_jvmdir}/%{jdklnk}/bin/$b
+   done
+   %{_sbindir}/update-alternatives --remove jdk \
+      %{_jvmdir}/%{jdklnk}
+   %{_sbindir}/update-alternatives --remove jdk-exports \
+      %{_jvmjardir}/%{jdklnk}
+fi
+:
+
+%pre runtime
+if [ $1 -ge 1 ]; then
+   [ -L %{_jvmdir}/%{jredir}/lib/fonts ] || rm -rf %{_jvmdir}/%{jredir}/lib/fonts
+   [ -L %{_jvmdir}/%{jredir}/lib/oblique-fonts ] || rm -rf %{_jvmdir}/%{jredir}/lib/oblique-fonts
+   [ -e %{_jvmdir}/%{jrelnk} ] && rm -rf %{_jvmdir}/%{jrelnk}
+   [ -L %{_bindir}/java -a "`readlink %{_bindir}/java`" != "%{_sysconfdir}/alternatives/java" ] &&
+      rm -f %{_bindir}/java
+
+   if [ -d /opt/java/jre ]; then
+      # legacy cleanups
+      %{_sbindir}/update-alternatives --remove java \
+         /opt/java/jre/bin/java 2>/dev/null
+   fi
+
+   %{_sbindir}/update-alternatives \
+      --install %{_bindir}/java java \
+      %{_jvmdir}/%{jrelnk}/bin/java 56
+   %{_sbindir}/update-alternatives \
+      --install %{_jvmdir}/jre jre \
+      %{_jvmdir}/%{jrelnk} 56
+   %{_sbindir}/update-alternatives \
+      --install %{_jvmjardir}/jre jre-exports \
+      %{_jvmjardir}/%{jrelnk} 56
+fi
+:
+
+%post runtime
+if [ -x %{_bindir}/fc-cache ]; then
+   %{_bindir}/fc-cache %{_datadir}/fonts/ttf/j2se-%{origin}
+   %{_bindir}/fc-cache %{_datadir}/fonts/ttf/j2se-%{origin}-oblique
+fi
+
+if ! echo ${PATH} | grep -q  %{_jvmdir}/jre/bin; then
+   export PATH="$PATH: %{_jvmdir}/jre/bin"
+fi
+
+if [ -d %{_jvmdir}/%{jrelnk}/lib/security ]; then
+   # Need to remove the old jars in order to support upgrading
+   # update-alternatives fails silently if the link targets exist as files
+   rm -f %{_jvmdir}/%{jrelnk}/lib/security/{local,US_export}_policy.jar
+fi
+
+%{_sbindir}/update-alternatives \
+   --install %{_jvmdir}/%{jredir}/lib/oblique-fonts \
+   oblique_fonts_%{javaver}_%{origin} %{_datadir}/fonts/ttf/j2se-%{origin}-oblique 56
+
+%{_sbindir}/update-alternatives \
+   --install %{_jvmdir}/%{jredir}/lib/fonts fonts_%{javaver}_%{origin} \
+   %{_datadir}/fonts/ttf/j2se-%{origin} 56
+
+%{_sbindir}/update-alternatives \
+   --install %{_jvmdir}/%{jrelnk}/lib/security/local_policy.jar \
+   jce_%{javaver}_%{origin}_local_policy %{_jvmprivdir}/%{name}/jce/vanilla/local_policy.jar 56
+
+%{_sbindir}/update-alternatives \
+   --install %{_jvmdir}/%{jrelnk}/lib/security/US_export_policy.jar \
+   jce_%{javaver}_%{origin}_us_export_policy %{_jvmprivdir}/%{name}/jce/vanilla/US_export_policy.jar 56
+:
+
+%preun runtime
+if [ $1 -eq 0 ]; then
+   %{_sbindir}/update-alternatives --remove java \
+      %{_jvmdir}/%{jrelnk}/bin/java
+   %{_sbindir}/update-alternatives --remove jre \
+      %{_jvmdir}/%{jrelnk}
+   %{_sbindir}/update-alternatives --remove jre-exports \
+      %{_jvmjardir}/%{jrelnk}
+fi
+:
+
+%postun runtime
+if [ $1 -eq 0 ]; then
+   if [ -x %{_bindir}/fc-cache ]; then
+      %{_bindir}/fc-cache --system-only
+   fi
+   %{_sbindir}/update-alternatives \
+      --remove jce_%{javaver}_%{origin}_local_policy \
+      %{_jvmprivdir}/%{name}/jce/vanilla/local_policy.jar
+   %{_sbindir}/update-alternatives \
+      --remove oblique_fonts_%{javaver}_%{origin} \
+      %{_datadir}/fonts/ttf/j2se-%{origin}-oblique
+   %{_sbindir}/update-alternatives \
+      --remove fonts_%{javaver}_%{origin} \
+      %{_datadir}/fonts/ttf/j2se-%{origin}
+fi
+:
+
+%files
+%defattr(-,root,root)
+#%{_sysconfdir}/profile.d/%{jdklnk}.sh
+%{_jvmdir}/%{jdklnk}
+%{_jvmjardir}/%{jdklnk}
+%{_jvmdir}/%{jdkdir}/bin
+#%{_jvmdir}/%{jdkdir}/db
+#%{_jvmdir}/%{jdkdir}/demo
+%{_jvmdir}/%{jdkdir}/lib
+%{_jvmdir}/%{jdkdir}/include
+#%{_jvmdir}/%{jdkdir}/sample
+%{_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
+%ifnarch arm
+%{_mandir}/man1/javafxpackager-sun7.1.gz
+%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
+%doc %{toplevel_dir}/COPYRIGHT %{toplevel_dir}/LICENSE
+%doc %{toplevel_dir}/THIRDPARTYLICENSEREADME.txt
+# %{toplevel_dir}/README*
+
+%files runtime
+%defattr(-,root,root)
+#%{_sysconfdir}/profile.d/%{jrelnk}.sh
+%dir %{_jvmdir}/%{jdkdir}
+%dir %{_jvmdir}/%{jredir}
+%dir %{_jvmdir}/%{jredir}/lib
+%{_jvmdir}/%{jredir}/lib/*.jar
+%{_jvmdir}/%{jredir}/lib/*.properties*
+%{_jvmdir}/%{jredir}/lib/fontconfig*.bfc
+%{_jvmdir}/%{jredir}/lib/classlist
+%{_jvmdir}/%{jredir}/lib/jexec
+%{_jvmdir}/%{jredir}/lib/*.txt
+%{_jvmdir}/%{jredir}/lib/meta-index
+#%{_jvmdir}/%{jredir}/lib/audio
+%{_jvmdir}/%{jredir}/lib/cmm
+%ifnarch arm
+%{_jvmdir}/%{jredir}/lib/deploy
+%{_jvmdir}/%{jredir}/lib/desktop
+%{_jvmdir}/%{jredir}/lib/locale
+%endif
+%{_jvmdir}/%{jredir}/lib/ext
+%ifarch %{ix86}
+%{_jvmdir}/%{jredir}/lib/i386
+%endif
+%ifarch x86_64
+%{_jvmdir}/%{jredir}/lib/x86_64
+%endif
+%ifarch arm
+%{_jvmdir}/%{jredir}/lib/arm
+%endif
+#%{_jvmdir}/%{jredir}/lib/im
+%{_jvmdir}/%{jredir}/lib/images
+%{_jvmdir}/%{jredir}/lib/management
+%dir %{_jvmdir}/%{jredir}/lib/security
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
+%ifnarch arm
+%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
+%{_jvmdir}/%{jredir}/lib/currency.data
+%{_jvmdir}/%{jredir}/lib/servicetag
+%{_jvmdir}/%{jredir}/.systemPrefs
+%{_jvmdir}/%{jredir}/lib/zi
+
+%{_jvmdir}/%{jredir}/lib/fonts
+%{_jvmdir}/%{jredir}/lib/oblique-fonts
+
+%dir %{_jvmprivdir}/%{name}
+%dir %{_jvmprivdir}/%{name}/jce
+%dir %{_jvmprivdir}/%{name}/jce/vanilla
+%config(noreplace) %{_jvmprivdir}/%{name}/jce/vanilla/US_export_policy.jar
+%config(noreplace) %{_jvmprivdir}/%{name}/jce/vanilla/local_policy.jar
+%{_jvmdir}/%{jredir}/bin
+#%{_jvmdir}/%{jredir}/javaws
+#%{_jvmdir}/%{jredir}/lib
+%ifnarch arm
+%{_jvmdir}/%{jredir}/plugin
+%endif
+%{_jvmdir}/%{jrelnk}
+%{_jvmjardir}/%{jrelnk}
+%{_jvmjardir}/%{jppname}/jaas*.jar
+%{_jvmjardir}/%{jppname}/jce*jar
+%{_jvmjardir}/%{jppname}/jdbc-stdext*jar
+%{_jvmjardir}/%{jppname}/jndi*.jar
+%{_jvmjardir}/%{jppname}/jsse*.jar
+%{_jvmjardir}/%{jppname}/sasl*.jar
+#%{_jvmjardir}/%{jppname}/xml-commons-apis.jar
+%ifnarch arm
+%{_libdir}/mozilla/plugins/libjava7plugin*.so
+%{_libdir}/mozilla/plugins/libnpjp2-7.so
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}-javaws.desktop
+%{_datadir}/applications/%{name}-jcontrol.desktop
+%{_datadir}/applications/%{name}-jvisualvm.desktop
+%{_datadir}/icons/*/*x*/*/*.png
+%{_datadir}/icons/mini/%{name}.png
+%{_datadir}/mime/packages/x-java-*.xml
+%{_datadir}/pixmaps/%{name}.png
+%endif
+%dir %{_datadir}/fonts/ttf/j2se-sun-oblique
+%{_datadir}/fonts/ttf/j2se-sun-oblique/*.ttf
+%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
+%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
+* Sun Aug 19 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 7u6-2mamba
+- rename to sun-java7
+
+* Thu Aug 16 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 7u6-1mamba
+- update to 7u6
+
+* Tue Mar 27 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 6u26-2mamba
+- don't obsolete jre and jdk
+
+* Wed Jun 08 2011 Automatic Build System <autodist@mambasoft.it> 6u26-1mamba
+- automatic update by autodist
+
+* Wed Apr 27 2011 Automatic Build System <autodist@mambasoft.it> 6u25-1mamba
+- automatic update by autodist
+
+* Thu Feb 17 2011 Automatic Build System <autodist@mambasoft.it> 6u24-1mamba
+- automatic update by autodist
+
+* Wed Oct 13 2010 Automatic Build System <autodist@mambasoft.it> 6u22-1mamba
+- automatic update to 6u22 by autodist
+
+* Mon Jul 26 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 6u21-3mamba
+- don't launch chrpath or executables won't find libraries because they are not in system path
+
+* Wed Jul 21 2010 Stefano Cotta Ramusino <stefano.cotta@openmamba.org> 6u21-2mamba
+- specfile fixes and cleanup
+- fix broken fonts symlink
+- edit %%post and %%postun runtime scripts
+
+* Fri Jul 16 2010 Automatic Build System <autodist@mambasoft.it> 6u21-1mamba
+- automatic update to 6u21 by autodist
+
+* Mon Jun 14 2010 Silvan Calarco <silvan.calarco@mambasoft.it> 6u20-2mamba
+- link libnpjp2.so instead of libjavaplugin.so to /usr/lib/mozilla/plugins
+
+* Fri Apr 16 2010 Automatic Build System <autodist@mambasoft.it> 6u20-1mamba
+- automatic update to 6u20 by autodist
+
+* Wed Mar 31 2010 Automatic Build System <autodist@mambasoft.it> 6u19-1mamba
+- automatic update to 6u19 by autodist
+
+* Thu Jan 21 2010 Automatic Build System <autodist@mambasoft.it> 6u18-1mamba
+- automatic update to 6u18 by autodist
+
+* Tue Nov 17 2009 Automatic Build System <autodist@mambasoft.it> 6u17-1mamba
+- automatic update to 6u17 by autodist
+
+* Wed Sep 23 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 6u16-2mamba
+- fixed wrong symlink destination for jav for mozilla plugin files
+
+* Mon Aug 17 2009 Automatic Build System <autodist@mambasoft.it> 6u16-1mamba
+- automatic update to 6u16 by autodist
+
+* Thu Aug 06 2009 Automatic Build System <autodist@mambasoft.it> 6u15-1mamba
+- automatic update to 6u15 by autodist
+
+* Mon Jul 13 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 6u14-2mamba
+- create symlink of jre jar's into jdk lib directory
+
+* Tue Jun 09 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 6u14-1mamba
+- update to 6u14
+
+* Fri Jun 05 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 6u13-4mamba
+- manage /usr/lib/jvm/{jdk,jre} as alternatives
+- remove profile files for setting JAVA_HOME (now handled by initscripts and alternatives)
+
+* Thu Jun 04 2009 Silvan Calarco <silvan.calarco@mambasoft.it> 6u13-3mamba
+- added symlink in /usr/lib/jvm
+
+* Mon Apr 20 2009 gil <puntogil@libero.it> 6u13-2mamba
+- added requirement for menu-java
+
+* Wed Mar 18 2009 gil <puntogil@libero.it> 6u13-1mamba
+- update to 6u13
+- edit spec file
+
+* Tue Sep 23 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 6u7-1mamba
+- automatic update to 6u7 by autodist
+
+* Tue Mar 11 2008 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.0-4mamba
+- update to release 6u4
+- manage /usr/bin/{java,javac,jar} using alternatives with priority 50
+
+* Sat Apr 07 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.0-3mamba
+- install into /opt/java
+
+* Mon Feb 26 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.0-2qilnx
+- check and handle a pre-existing /usr/java/jre%version dir
+
+* Mon Feb 19 2007 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.0-1qilnx
+- new build under the Operating System Distributor License for Java (DLJ 1.1)
+
+* Fri Feb 02 2007 Davide Madrisan <davide.madrisan@qilinux.it> 1.5-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@mambasoft.it> 1.5.0-3qilnx
+- remove %{javapath}/.systemPrefs if found
+
+* Wed Apr 20 2005 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.0-2qilnx
+- enable resume of download
+- remove requirements and provides
+
+* Wed Apr 20 2005 Silvan Calarco <silvan.calarco@mambasoft.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@mambasoft.it> 1.4.2-2qilnx
+- create symlinks for browser plugins to /usr/lib/mozilla/plugins
+
+* Mon Oct 13 2003 Silvan Calarco <silvan.calarco@mambasoft.it> 1.4.2-1qilnx
+- first build

SRPMS/virtualbox-extension-pack/LICENSE

@@ -0,0 +1,34 @@
+VirtualBox PUEL terms and conditions
+License version 8, April 19, 2010
+
+ORACLE CORPORATION (“ORACLE”) IS WILLING TO LICENSE THE PRODUCT (AS DEFINED IN § 1 BELOW) TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS VIRTUALBOX PERSONAL USE AND EVALUATION LICENSE AGREEMENT (“AGREEMENT”). PLEASE READ THE AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS PRODUCT, YOU ACCEPT THE FULL TERMS OF THIS AGREEMENT.
+
+IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY OTHER THAN AN INDIVIDUAL PERSON, YOU REPRESENT THAT YOU ARE BINDING AND HAVE THE RIGHT TO BIND THE ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+
+§ 1 Subject of Agreement. “Product”, as referred to in this Agreement, shall be the binary software package “Oracle VM VirtualBox,” which Product allows for creating multiple virtual computers, each with different operating systems (“Guest Computers”), on a physical computer with a specific operating system (“Host Computer”), to allow for installing and executing these Guest Computers simultaneously. The Product consists of executable files in machine code for the Solaris, Windows, Linux, and Mac OS X operating systems as well as other data files as required by the executable files at run-time and documentation in electronic form. The Product includes all documentation and updates provided to You by Oracle under this Agreement and the terms of this Agreement will apply to all such documentation and updates unless a different license is provided with an update or documentation.
+
+§ 2 Grant of license. (1) Oracle grants you a personal, non-exclusive, non-transferable, limited license without fees to reproduce, install, execute, and use internally the Product a Host Computer for your Personal Use, Educational Use, or Evaluation. “Personal Use” requires that you use the Product on the same Host Computer where you installed it yourself and that no more than one client connect to that Host Computer at a time for the purpose of displaying Guest Computers remotely. “Educational use” is any use in an academic institution (schools, colleges and universities, by teachers and students). “Evaluation” means testing the Product for a reasonable period (that is, normally for a few weeks); after expiry of that term, you are no longer permitted to evaluate the Product.
+
+(2) The “VirtualBox Guest Additions” are a set of drivers and utilities that are shipped as a subset of the Product for the purpose of being installed inside a Guest Computer to improve its performance and cooperation with the rest of the Product. In addition to and independent of the rights granted by subsection 1, Oracle allows you to install, execute, copy and redistribute a) unmodified copies of the ISO installation medium of the VirtualBox Guest Additions as shipped with the Product and b) the VirtualBox Guest Additions together with the Guest Computer into which they have been installed.
+
+§ 3 Restrictions and Reservation of Rights. (1) Any use beyond the provisions of § 2 is prohibited. The Product and copies thereof provided to you under this Agreement are copyrighted and licensed, not sold, to you by Oracle. Oracle reserves all copyrights and other intellectual property rights. This includes, but is not limited to, the right to modify, make available or public, rent out, lease, lend or otherwise distribute the Product. This does not apply as far as applicable law may require otherwise or if Oracle grants you additional rights of use in a separate agreement in writing.
+
+(2) You may not do any of the following: (a) modify the Product. However if the documentation accompanying Product lists specific portions of Product, such as header files, class libraries, reference source code, and/or redistributable files, that may be handled differently, you may do so only as provided in the documentation; (b) rent, lease, lend or encumber the Product; (c) remove or alter any proprietary legends or notices contained in the Product; or (d) decompile, or reverse engineer the Product (unless enforcement of this restrictions is prohibited by applicable law).
+
+(3) The Product is not designed, licensed or intended for use in the design, construction, operation or maintenance of any nuclear facility and Oracle and its licensors disclaim any express or implied warranty of fitness for such uses.
+
+(4) No right, title or interest in or to any trademark, service mark, logo or trade name of Oracle or its licensors is granted under this Agreement.
+
+§ 4 Termination. The Agreement is effective on the Date you receive the Product and remains effective until terminated. Your rights under this Agreement will terminate immediately without notice from Oracle if you materially breach it or take any action in derogation of Oracle's and/or its licensors' rights to Product. Oracle may terminate this Agreement should any Product become, or in Oracle's reasonable opinion likely to become, the subject of a claim of intellectual property infringement or trade secret misappropriation. Upon termination, you will cease use of, and destroy, Product and confirm compliance in writing to Oracle. Sections 3-9, inclusive, will survive termination of the Agreement.
+
+§ 5 Disclaimer of Warranty. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, ORACLE PROVIDES THE PRODUCT “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. The entire risk as to the quality and performance of the Product is with you. Should it prove defective, you assume the cost of all necessary servicing, repair, or correction. In addition, Oracle shall be allowed to provide updates to the Product in urgent cases. You are then obliged to install such updates. Such an urgent case includes, but is not limited to, a claim of rights to the Product by a third party.
+
+§ 6 Limitation of Liability. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT WILL ORACLE 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 PRODUCT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Oracle's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Product under this Agreement. Some states do not allow the exclusion of incidental or consequential damages, so some of the terms above may not be applicable to you.
+
+§ 7 Third Party Code. Portions of Product may be provided with notices and open source licenses from communities and third parties that govern the use of those portions, and any licenses granted hereunder do not alter any rights and obligations You may have under such open source licenses, however, the disclaimer of warranty and limitation of liability provisions in this Agreement will apply to all the Product.
+
+§ 8 Export Regulations. All Product, documents, technical data, and any other materials delivered under this Agreement are subject to U.S. export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with these laws and regulations and acknowledge that you have the responsibility to obtain any licenses to export, re-export, or import as may be required after delivery to you.
+
+§ 9 U.S. Government Restricted Rights. If Product 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 Product 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).
+
+§ 10 Miscellaneous. This Agreement is the entire agreement between you and Oracle 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. 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. Course of dealing and other standard business conditions of the parties or the industry shall not apply. This Agreement is governed by the substantive and procedural laws of California and you and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts in San Francisco, San Mateo, or Santa Clara counties in California in any dispute arising out of or relating to this Agreement.

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

@@ -0,0 +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
+
+# package URL (do not modify unless you know what you're doing)
+VIRTUALBOX_EXTENSION_PACK_URL=http://download.virtualbox.org/virtualbox/@virtualboxextensionpackver@/

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

@@ -0,0 +1,60 @@
+%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@
+Epoch:         1
+Summary:       VirtualBox Extension Pack
+Group:         Applications/Emulators
+Vendor:        @vendor@
+Distribution:  @distribution@
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://www.virtualbox.org/
+Source:        LICENSE
+License:       Not Distributable
+Requires(post):VirtualBox
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+VirtualBox Extension Pack.
+
+%prep
+%setup -c -n %{name}-%{version} -T
+
+[ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+. /etc/sysconfig/@sysconfigfile@
+
+[ "${VIRTUALBOX_EXTENSION_PACK_PCK}" ] || exit 1
+[ "${VIRTUALBOX_EXTENSION_PACK_URL}" ] || exit 1
+
+wget -nv --timeout=10 --tries=2 \
+   ${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_EXTENSION_PACK_PCK} -O ${VIRTUALBOX_EXTENSION_PACK_PCK}
+
+[ -f ${VIRTUALBOX_EXTENSION_PACK_PCK} ] || exit 1
+
+%build
+
+%install
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+. /etc/sysconfig/@sysconfigfile@
+
+install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}/opt/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}
+cp %{S:0} LICENSE
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+%post
+#VBoxManage extpack uninstall Oracle_VM_VirtualBox_Extension_Pack || true
+VBoxManage extpack install /opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack --replace
+# not working
+:
+
+%files
+%defattr(-,root,root)
+/opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
+%doc LICENSE
+
+%changelog
+* Tue Aug 16 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2.73507-1mamba
+- specfile created

SRPMS/win32codecs/win32codecs.spec.in

@@ -69,20 +69,20 @@ rm -f $tmpfile
 
 [ "$tarball" ] || exit 1
 
-# check if the latest version is already installed
-if [ -r %{win32dir}/VERSION_w32codecs ]; then
-   currver="$(cat %{win32dir}/VERSION_w32codecs)"
-   case "$tarball" in
-   "all-${currver}.tar.bz2")
-      echo "the latest version is already installed"
-      exit 1 ;;
-   esac
-fi
+## check if the latest version is already installed
+#if [ -r %{win32dir}/VERSION_w32codecs ]; then
+#   currver="$(cat %{win32dir}/VERSION_w32codecs)"
+#   case "$tarball" in
+#   "all-${currver}.tar.bz2")
+#      echo "the latest version is already installed"
+#      exit 1 ;;
+#   esac
+#fi
 
 curl --url $URL/$tarball -o $tarball || exit 1
 echo $tarball | sed 's/all-\([0-9]*\).tar.*/\1/' > VERSION_w32codecs
 
-tar xjf $tarball && rm -f $tarball
+tar xf $tarball --strip-components=1 && rm -f $tarball
 
 %build
 

SRPMSVERSIONS

@@ -1,3 +1,5 @@
-FLASHPLUGIN_VERSION=10.3.181.26
+FLASHPLUGIN_VERSION=11.2.202.275
 WIN32CODECS_VERSION=20110131
-SKYPE_VERSION=2.2.0.25
+SKYPE_VERSION=4.1.0.20
+VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
+SUN_JAVA7_VERSION=7u6

VERSION

@@ -1,2 +1 @@
-VERSION = 2.2.24
-
+VERSION = 2.3.18

apt/post-install.conf

@@ -1,2 +0,0 @@
-Scripts::PM::Post:: "post-install.lua";
-Apt::Get::post-install "true";

apt/post-install.lua

@@ -1,12 +0,0 @@
--- This script will perform operations after new packages have been installed
---
--- Author: Silvan Calarco <silvan.calarco@qilinux.it> Copyright (c) 2009
---
-
--- Allow someone to disable this without removing the script.
-if confget("APT::Get::post-install/b", "true") == "false" then
-   return
-end
-
-os.execute("/usr/share/apt/scripts/post-install.sh")
-return

apt/post-install.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-[ -x /usr/bin/update-mime-database ] && update-mime-database /usr/share/mime >/dev/null
-IFS=":"
-for d in $XDG_DATA_DIRS; do
-   [ -x /usr/bin/update-desktop-database ] && update-desktop-database -q $d/applications/ >/dev/null
-done
-exit 0

bootrecover/bootrecover.kmdr

@@ -305,7 +305,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -426,128 +426,6 @@ This tool is also useful before the installation of a third party boot manager i
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>setlabel</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>40</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="populationText">
-                <string></string>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@execBegin
-@if (@devicesbox.currentItem &gt;= 0)
-   currdev=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
-   @showdevice.setText(@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0))
-   @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, true)
-   @BackBox.setChecked(true)
-
-   parent_udi=`hal-find-by-property  --key block.device --string /dev/$currdev`
-   #
-   # set MBR combo box
-   #
-   dcop @dcopid KommanderIf "clear(QString)" mbrbox
-   storages=`hal-find-by-capability --capability storage`
-   dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "$currdev (@i18n("System partition"))" 0
-   for udi in $storages; do
-      device=`hal-get-property --udi $udi --key block.device`
-      hotpluggable=`hal-get-property --udi $udi --key storage.hotpluggable` || hotpluggable="false"
-      partscheme=`hal-get-property --udi $udi --key storage.partitioning_scheme`
-      if [ "$partscheme" == "mbr" -a "$hotpluggable" != "true" ]; then
-         dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
-      fi
-   done
-   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
-@endif
-@execEnd
-@setBootableCheckbox.execute()</string>
-                </stringlist>
-            </property>
-        </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>scanDevices</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>0</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@devicesbox.clear
-@BackBox.setChecked(false)
-@NextBox.setChecked(false)
-@execBegin
-volumes=`hal-find-by-capability --capability volume`
-partlabel=
-
-for udi in $volumes; do
-   device=`hal-get-property --udi $udi --key block.device`
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
-   volname=`hal-get-property --udi $udi --key volume.label`
-   [ "$volname" ] || volname="unnamed"
-   parttype=`hal-get-property --udi $udi --key volume.partition.type`
-   [ "$parttype" ] || parttype="unknown"
-   partscheme=`hal-get-property --udi $udi --key volume.partition.scheme`
-   [ "$partscheme" ] || partscheme="unknown"
-   fstype=`hal-get-property --udi $udi --key volume.fstype`
-   [ "$fstype" ] || fstype="unformatted"
-   is_mounted=`hal-get-property --udi $udi --key volume.is_mounted`
-   [ "$is_mounted" = "true" ] || {
-      mkdir /mnt/${device:5:5} &amp;&amp; mount $device /mnt/${device:5:5}
-   }
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
-   add_info=""
-   [ "$hotpluggable" = "true" ] &amp;&amp; {
-      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 "$parttype" in
-         0x82) ;;
-         0x83)
-            [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
-               release=`cat $mount_point/etc/openmamba-release`
-               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point ($fstype,$volname,$volsize MB${add_info})" 0
-            }
-            ;;
-         *) ;;
-      esac
-   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
-      case "$fstype" in
-         swap|iso9660) ;;
-         ext2|ext3|reiserfs|unformatted)
-           [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
-               release=`cat $mount_point/etc/openmamba-release`
-               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point $volsize MB ($release)" 0
-            }
-            ;;
-         *) ;;
-      esac
-   fi
-done
-@execEnd
-</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="GroupBox">
             <property name="name">
                 <cstring>PartitionBox</cstring>
@@ -601,27 +479,6 @@ done
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>showdevice</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>230</x>
-                        <y>340</y>
-                        <width>280</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label3</cstring>
@@ -667,6 +524,158 @@ done
                     </stringlist>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>showdevice</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>180</x>
+                        <y>340</y>
+                        <width>350</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>scanDevices</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>0</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@devicesbox.clear
+@BackBox.setChecked(false)
+@NextBox.setChecked(false)
+@execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
+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`
+   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_mounted=`get_udisks_key $device "is mounted"`
+   [ "$is_mounted" = "1" ] || {
+      mkdir /mnt/${device:5:5} &amp;&amp; mount $device /mnt/${device:5:5}
+   }
+   mount_point=`get_udisks_key $device "mount paths"`
+   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
+         ext2|ext3|ext4|reiserfs|reiser4)
+            [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
+               release=`cat $mount_point/etc/openmamba-release`
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point ($fstype,$volname,$volsize MB${add_info})" 0
+            }
+            ;;
+         *) ;;
+      esac
+   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
+      case "$fstype" in
+         swap|iso9660) ;;
+         ext2|ext3|ext4|reiserfs|reiser4)
+           [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
+               release=`cat $mount_point/etc/openmamba-release`
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point $volsize MB ($release)" 0
+            }
+            ;;
+         *) ;;
+      esac
+   fi
+done
+@execEnd
+</string>
+                </stringlist>
+            </property>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>setlabel</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>40</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="populationText">
+                <string></string>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -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))
+   @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, true)
+   @BackBox.setChecked(true)
+
+   #
+   # set MBR combo box
+   #
+   dcop @dcopid KommanderIf "clear(QString)" mbrbox
+   devices=`udisks --enumerate-device-files | grep -v /dev/disk`
+   dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "$currdev (@i18n("System partition"))" 0
+
+   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
+      fi
+   done
+   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
+@endif
+@execEnd
+@setBootableCheckbox.execute()
+</string>
+                </stringlist>
+            </property>
         </widget>
     </widget>
     <widget class="QWidget">
@@ -837,41 +846,6 @@ done
                     <set>WordBreak|AlignTop</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 class="ListBox">
                 <property name="name">
                     <cstring>chainloadbox</cstring>
@@ -907,6 +881,41 @@ fi
                     <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">
@@ -927,38 +936,39 @@ fi
 @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)
-volumes=`hal-find-by-capability --capability volume`
+devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n -r`
 partlabel=
 
-for udi in $volumes; do
-   device=`hal-get-property --udi $udi --key block.device`
-   [ "${device:5:5}" = "$installdevice" ] &amp;&amp; continue
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
+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=`hal-get-property --udi $udi --key volume.label`
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
+   volname=`get_udisks_key $device label`
    [ "$volname" ] || volname="unnamed"
-   parttype=`hal-get-property --udi $udi --key volume.partition.type`
+   parttype=`get_udisks_key $device usage`
    [ "$parttype" ] || parttype="unknown"
-   partscheme=`hal-get-property --udi $udi --key volume.partition.scheme`
+   partscheme=`get_udisks_key $device scheme`
    [ "$partscheme" ] || partscheme="unknown"
-   fstype=`hal-get-property --udi $udi --key volume.fstype`
+   fstype=`get_udisks_key $device type`
    [ "$fstype" ] || fstype="unformatted"
    add_info=""
-   [ "$hotpluggable" = "true" ] &amp;&amp; {
+   [ "$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 "$parttype" in
-         0x82) ;;
-         0x83) ;;
+      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})"
          ;;
@@ -966,7 +976,7 @@ for udi in $volumes; do
    elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
       case "$fstype" in
          swap|iso9660|unformatted) ;;
-         ext2|ext3|reiserfs) ;;
+         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})"
          ;;
@@ -1025,6 +1035,33 @@ done
                 <set>AlignCenter</set>
             </property>
         </widget>
+        <widget class="TextEdit">
+            <property name="name">
+                <cstring>installlog</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>20</x>
+                    <y>60</y>
+                    <width>540</width>
+                    <height>360</height>
+                </rect>
+            </property>
+            <property name="hScrollBarMode">
+                <enum>AlwaysOn</enum>
+            </property>
+            <property name="textFormat">
+                <enum>LogText</enum>
+            </property>
+            <property name="populationText">
+                <string></string>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string></string>
+                </stringlist>
+            </property>
+        </widget>
         <widget class="ScriptObject">
             <property name="name">
                 <cstring>launchinstall</cstring>
@@ -1078,7 +1115,7 @@ _EOF
 
 @if (@confirmBox.checked); then
    @dcop(@dcopid, KommanderIf, setEnabled(QString,bool), back, false)
-   @exec("/usr/share/openmamba/bootrecover/bootrecover.sh -y @dcopid &amp;&gt; ~/.bootrecover.log")
+   @exec("sudo /usr/share/openmamba/bootrecover/bootrecover.sh ~/.bootrecover.conf @dcopid `whoami` &amp;&gt; ~/.bootrecover.log")
    @execBegin
       dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
    @execEnd
@@ -1113,33 +1150,6 @@ _EOF
                 </stringlist>
             </property>
         </widget>
-        <widget class="TextEdit">
-            <property name="name">
-                <cstring>installlog</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>20</x>
-                    <y>60</y>
-                    <width>540</width>
-                    <height>360</height>
-                </rect>
-            </property>
-            <property name="hScrollBarMode">
-                <enum>AlwaysOn</enum>
-            </property>
-            <property name="textFormat">
-                <enum>LogText</enum>
-            </property>
-            <property name="populationText">
-                <string></string>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string></string>
-                </stringlist>
-            </property>
-        </widget>
     </widget>
 </widget>
 <images>

bootrecover/bootrecover.sh

@@ -1,13 +1,12 @@
 # openmamba boot loader recovery script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 
-VERSION=0.6
+VERSION=0.7
 TEXTDOMAIN=bootrecover
 TEXTDOMAINDIR=/opt/kde3/share/locale/
 INSTALL_DATE=`date +%Y%m%d-%H%M`
-INPUT_FILE=~/.bootrecover.conf
 LOG_FILE=/var/log/bootrecover-$INSTALL_DATE.log
 MOUNTPOINT=/mnt/install
 KERNEL_RELEASE=`uname -r`
@@ -72,70 +71,23 @@ Installation time: $TIME_ELAPSED minutes"
    done
 }
 
-function find_driver_for_udi() {
-   local found_driver parent_udi
+export PATH=$PATH:/sbin:/usr/sbin:/opt/kde3/bin
 
-   parent_udi=$1
-   while [ ! "$found_driver" -a "$parent_udi" != "/org/freedesktop/Hal/devices/computer" ]; do
-      parent_udi=`hal-get-property --udi $parent_udi --key info.parent 2>/dev/null`
-      [ "`hal-get-property --udi $parent_udi --key info.bus 2>/dev/null`" = "pci" ] &&
-         found_driver=`hal-get-property --udi $parent_udi --key info.linux.driver 2>/dev/null`
-   done
-   if [ "$found_driver" ]; then
-      echo $found_driver
-      return 0
-   else
-      return 1
-   fi
-}
-
-function find_remapped_device() {
-
-   local REMAPPED_INSTALL_DEVICE
-
-   tempfile=`tempfile 2>/dev/null`
-   mapfile=`tempfile 2>/dev/null`
-
-   # generate current volumes sorted list with driver information
-   storages=`hal-find-by-capability --capability storage`
-   for s in $storages; do
-      device=`hal-get-property --udi $s --key block.device`
-      linux_driver=`find_driver_for_udi $s`
-      [ "${device:5:2}" = "sd" ] && \
-         echo "${device:0:8} $linux_driver" >> $tempfile
-   done
-   # sort
-   cat $tempfile|sort > $mapfile
-   rm -f $tempfile
-
-   LETTERS=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
-
-   CURR_DRIVE_LETTER=0
-   while read line; do
-      set -- $line
-      [ "$1" = "$INSTALL_DISK_DEVICE" ] && REMAPPED_INSTALL_DEVICE="${INSTALL_DEVICE:0:7}${LETTERS[CURR_DRIVE_LETTER]}${INSTALL_DEVICE:8:2}"
-      [ "$2" = "$INSTALL_DRIVER" ] && {
-         DEV_NAME_ORIG=(${DEV_NAME_ORIG[*]} $1)
-         DEV_NAME_DEST=(${DEV_NAME_DEST[*]} ${1:0:7}${LETTERS[CURR_DRIVE_LETTER]})
-         let CURR_DRIVE_LETTER+=1
-      }
-   done < $mapfile
-   [ "$REMAPPED_INSTALL_DEVICE" ] || REMAPPED_INSTALL_DEVICE=$INSTALL_DEVICE
-   echo $REMAPPED_INSTALL_DEVICE
-
-   rm -f $mapfile
-   rm -f $tmpfile
-}
-
-DCOPID=$2
+INPUT_FILE=$1
+[ "$2" -a "$3" ] && DCOPID="--user $3 $2"
 
 echo $"\
 openmamba boot loader recovery script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 dcop_write $"Starting installation..." 5
 
+[ $INPUT_FILE ] || {
+   echo $"Error: this script must be called by bootloader.kmdr; aborting." >&2
+   abort
+}
+
 [ -r $INPUT_FILE ] || {
    echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
    abort
@@ -166,9 +118,6 @@ MOUNTPOINT=$INSTALL_MOUNTPOINT
    abort
 }
 
-REMAPPED_INSTALL_DEVICE=`find_remapped_device $INSTALL_DEVICE`
-echo $"Install device $INSTALL_DEVICE will be known as $REMAPPED_INSTALL_DEVICE in the installed system" | tee -a $LOG_FILE
-
 dcop_write $"Binding system dirs to new mountpoint..." 73
 mount -o bind /dev $MOUNTPOINT/dev || {
    echo $"Error: could not mount $MOUNTPOINT/dev; aborting." >&2
@@ -188,7 +137,7 @@ mount -o bind /proc $MOUNTPOINT/proc || {
 if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
 
    for k in $MOUNTPOINT/boot/vmlinuz-*; do 
-      KVER=${k/\/boot\/vmlinuz-}
+      KVER=${k/*\/boot\/vmlinuz-}
       dcop_write $"Recreating initramfs for $KVER kernel..." 82
       echo $"Recreating initramfs for $KVER kernel" | tee -a $LOG_FILE
       chroot $MOUNTPOINT mkinitrd -f /boot/initramfs-${KVER}.img ${KVER}
@@ -246,10 +195,6 @@ _EOF
    }
 
    chroot $MOUNTPOINT update-grub | tee -a $LOGFILE
-
-   [ "${INSTALL_DEVICE}" != "${REMAPPED_INSTALL_DEVICE}" ] && \
-      sed -i "s|root=/dev/${INSTALL_DEVICE:5:5}|root=/dev/${REMAPPED_INSTALL_DEVICE:5:5}|" \
-             $MOUNTPOINT/boot/grub/grub.cfg
 else
    echo $"Info: skipping bootloader installation" | tee -a $LOG_FILE
 fi

bootrecover/bootrecover.sh~

@@ -1,270 +0,0 @@
-# openmamba boot loader recovery script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-#
-# Released under the terms of the GNU GPLv3 License
-
-VERSION=0.6
-TEXTDOMAIN=bootrecover
-TEXTDOMAINDIR=/opt/kde3/share/locale/
-INSTALL_DATE=`date +%Y%m%d-%H%M`
-INPUT_FILE=~/.bootrecover.conf
-LOG_FILE=/var/log/bootrecover-$INSTALL_DATE.log
-MOUNTPOINT=/mnt/install
-KERNEL_RELEASE=`uname -r`
-
-function abort() {
-   [ "$DCOPID" ] && {
-      dcop $DCOPID KommanderIf setText progressText $"Installation aborted; press Next to see the error log."
-      dcop $DCOPID KommanderIf setText finallabel $"Installation aborted :-("
-      dcop $DCOPID KommanderIf setEnabled next true
-   }
-   exit 1
-}
-
-function finished() {
-   [ "$DCOPID" ] && {
-      dcop $DCOPID KommanderIf setText progressText $"Installation completed; press Next to continue."
-      dcop $DCOPID KommanderIf setText progressBar 100
-      dcop $DCOPID KommanderIf setText installTopLabel $"Installation completed."
-      dcop $DCOPID KommanderIf setText installInfoLabel ""
-      dcop $DCOPID KommanderIf setEnabled next true
-      dcop $DCOPID KommanderIf setEnabled ProgressGroupBox true
-   }
-   exit 1
-}
-
-function dcop_write() {
-   [ "$DCOPID" ] && {
-      dcop $DCOPID KommanderIf setText progressText "$1"
-      dcop $DCOPID KommanderIf setText progressBar $2
-   }
-}
-
-function apt_parser() {
-   while read line; do
-      [ "$DCOPID" ] && {
-         echo $line
-         dcop $DCOPID KommanderIf setText progressText2 "$line"
-      }
-   done
-}
-
-cp_parser_count=0
-date_start=`date +%s`
-
-function cp_parser() {
-   while read line; do
-      let cp_parser_count+=1
-      if [ $cp_parser_count -ge 100 ]; then
-         [ "$DCOPID" ] && {
-            CP_LINE=`echo ${line/*$MOUNTPOINT/}`
-	    MOUNT_SPACE=`du -sh $MOUNTPOINT`
-	    MOUNT_SPACE=${MOUNT_SPACE/$MOUNTPOINT/}
-	    let TIME_ELAPSED=\(`date +%s`-$date_start\)/60
-	    
-            dcop $DCOPID KommanderIf setText progressText2 $"\
-Copying: '$CP_LINE
-${MOUNT_SPACE}bytes copied
-Installation time: $TIME_ELAPSED minutes"
-         }
-	 cp_parser_count=0
-      fi
-   done
-}
-
-function find_driver_for_udi() {
-   local found_driver parent_udi
-
-   parent_udi=$1
-   while [ ! "$found_driver" -a "$parent_udi" != "/org/freedesktop/Hal/devices/computer" ]; do
-      parent_udi=`hal-get-property --udi $parent_udi --key info.parent 2>/dev/null`
-      [ "`hal-get-property --udi $parent_udi --key info.bus 2>/dev/null`" = "pci" ] &&
-         found_driver=`hal-get-property --udi $parent_udi --key info.linux.driver 2>/dev/null`
-   done
-   if [ "$found_driver" ]; then
-      echo $found_driver
-      return 0
-   else
-      return 1
-   fi
-}
-
-function find_remapped_device() {
-
-   local REMAPPED_INSTALL_DEVICE
-
-   tempfile=`tempfile 2>/dev/null`
-   mapfile=`tempfile 2>/dev/null`
-
-   # generate current volumes sorted list with driver information
-   storages=`hal-find-by-capability --capability storage`
-   for s in $storages; do
-      device=`hal-get-property --udi $s --key block.device`
-      linux_driver=`find_driver_for_udi $s`
-      [ "${device:5:2}" = "sd" ] && \
-         echo "${device:0:8} $linux_driver" >> $tempfile
-   done
-   # sort
-   cat $tempfile|sort > $mapfile
-   rm -f $tempfile
-
-   LETTERS=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
-
-   CURR_DRIVE_LETTER=0
-   while read line; do
-      set -- $line
-      [ "$1" = "$INSTALL_DISK_DEVICE" ] && REMAPPED_INSTALL_DEVICE="${INSTALL_DEVICE:0:7}${LETTERS[CURR_DRIVE_LETTER]}${INSTALL_DEVICE:8:2}"
-      [ "$2" = "$INSTALL_DRIVER" ] && {
-         DEV_NAME_ORIG=(${DEV_NAME_ORIG[*]} $1)
-         DEV_NAME_DEST=(${DEV_NAME_DEST[*]} ${1:0:7}${LETTERS[CURR_DRIVE_LETTER]})
-         let CURR_DRIVE_LETTER+=1
-      }
-   done < $mapfile
-   [ "$REMAPPED_INSTALL_DEVICE" ] || REMAPPED_INSTALL_DEVICE=$INSTALL_DEVICE
-   echo $REMAPPED_INSTALL_DEVICE
-
-   rm -f $mapfile
-   rm -f $tmpfile
-}
-
-DCOPID=$2
-
-echo $"\
-openmamba boot loader recovery script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
-"
-
-dcop_write $"Starting installation..." 5
-
-[ -r $INPUT_FILE ] || {
-   echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
-   abort
-}
-
-. $INPUT_FILE
-
-[ $INSTALL_DEVICE ] || {
-   echo $"Error: installation device is not defined in $INPUT_FILE; aborting." >&2
-   abort
-}
-
-INSTALL_DISK_DEVICE=${INSTALL_DEVICE:0:8}
-MOUNTPOINT=$INSTALL_MOUNTPOINT
-
-[ -d $MOUNTPOINT ] || {
-   echo $"Error: mount point $MOUNTPOINT does not exist or is not a directory; aborting." >&2
-   abort
-}
-
-[ -e $MOUNTPOINT/etc/openmamba-release ] || {
-   echo $"Error: file $MOUNTPOINT/etc/openmamba-release does not exist; aborting." >&2
-   abort
-}
-
-[ -e $MOUNTPOINT/usr/sbin/grub-install ] || {
-   echo $"Error: file $MOUNTPOINT/usr/sbin/grub-install missing; aborting." >&2
-   abort
-}
-
-REMAPPED_INSTALL_DEVICE=`find_remapped_device $INSTALL_DEVICE`
-echo $"Install device $INSTALL_DEVICE will be known as $REMAPPED_INSTALL_DEVICE in the installed system" | tee -a $LOG_FILE
-
-dcop_write $"Binding system dirs to new mountpoint..." 73
-mount -o bind /dev $MOUNTPOINT/dev || {
-   echo $"Error: could not mount $MOUNTPOINT/dev; aborting." >&2
-   abort
-}
-
-mount -o bind /sys $MOUNTPOINT/sys || {
-   echo $"Error: could not mount $MOUNTPOINT/sys; aborting." >&2
-   abort
-}
-
-mount -o bind /proc $MOUNTPOINT/proc || {
-   echo $"Error: could not mount $MOUNTPOINT/proc; aborting." >&2
-   abort
-}
-
-if [ "$INSTALL_BOOTLOADER_DEVICE" ]; then
-
-   for k in $MOUNTPOINT/boot/vmlinuz-*; do 
-      KVER=${k/\/boot\/vmlinuz-}
-      dcop_write $"Recreating initramfs for $KVER kernel..." 82
-      echo $"Recreating initramfs for $KVER kernel" | tee -a $LOG_FILE
-      chroot 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
-
-   grub-install $INSTALL_BOOTLOADER_DEVICE --root-directory=$MOUNTPOINT --recheck --no-floppy
-
-   [ "$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
-   }
-
-   [ "$INSTALL_BOOTLOADER_CHAINLOAD" ] && {
-      # configure boot chainloader for e.g. windows
-      GRUB_OTHER_TITLES=()
-      for i in ${INSTALL_BOOTLOADER_CHAINLOAD[*]}; do
-         # FIXME: missing conversion from device to grub (hdx,y) form
-	 unset ID_FS_UUID
-	 eval `blkid $i -o udev`
-         if [ "$ID_FS_UUID" ]; then
-	    if [ "$ID_FS_TYPE" = "ntfs" ]; then
-	       [ "$ID_FS_LABEL" ] &&
-	          ID_FS_LABEL="Windows ($ID_FS_LABEL)" || ID_FS_LABEL="Windows"
-	    elif [ "${ID_FS_TYPE:0:3}" = "fat" ]; then
-	       [ "$ID_FS_LABEL" ] &&
-	          ID_FS_LABEL="Win/DOS ($ID_FS_LABEL)" || ID_FS_LABEL="Windows/DOS"
-	    else
-	       [ "$ID_FS_LABEL" ] &&
-	          ID_FS_LABEL="Other OS ($ID_FS_LABEL)" || ID_FS_LABEL="Other OS"	    
-	    fi
-	    [ "$ID_FS_LABEL" ] || ID_FS_LABEL="W"
-	    GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]} /dev/disk/by-uuid/$ID_FS_UUID)
-	    GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"$ID_FS_LABEL\"")
-	 else
-	    GRUB_OTHER_DEV=$i
-            for o in `seq 1 ${#DEV_NAME_ORIG[*]}`; do
-               [ "${DEV_NAME_ORIG[o-1]}" = "${i:5:3}" ] && {
-	           GRUB_OTHER_DEV=${DEV_NAME_DEST[o-1]}${i:8:2}
-	   	   break
-               }
-	    done
-	    GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]} $GRUB_OTHER_DEV)
-	    GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]} "\"Windows on $GRUB_OTHER_DEV\"")
-	 fi
-      done
-      cat >> $MOUNTPOINT/etc/sysconfig/grub << _EOF
-GRUB_OTHER_DEVICES=(${GRUB_OTHER_DEVICES[*]})
-GRUB_OTHER_TITLES=(${GRUB_OTHER_TITLES[*]})
-_EOF
-   }
-
-   chroot $MOUNTPOINT update-grub | tee -a $LOGFILE
-
-   [ "${INSTALL_DEVICE}" != "${REMAPPED_INSTALL_DEVICE}" ] && \
-      sed -i "s|root=/dev/${INSTALL_DEVICE:5:5}|root=/dev/${REMAPPED_INSTALL_DEVICE:5:5}|" \
-             $MOUNTPOINT/boot/grub/grub.cfg
-else
-   echo $"Info: skipping bootloader installation" | tee -a $LOG_FILE
-fi
-
-## MBR backup
-#echo "Installing MBR record on $INSTALL_DISK_DEVICE" | tee -a $LOG_FILE
-#dd if=$INSTALL_DISK_DEVICE of=$MOUNTPOINT/boot/mbr-backup bs=1 count=512
-#install-mbr $INSTALL_DISK_DEVICE
-
-umount $MOUNTPOINT/dev
-umount $MOUNTPOINT/sys
-umount $MOUNTPOINT/proc
-umount $MOUNTPOINT
-finished
-
-echo $"Installation done. You can now reboot to start the freshly installed system." | tee -a $LOG_FILE
-
-exit 0

bootrecover/openmamba-bootrecover.desktop

@@ -8,7 +8,4 @@ Exec=kmdr-executor /usr/share/openmamba/bootrecover/bootrecover.kmdr
 Icon=bootrecover
 Terminal=0
 Type=Application
-Categories=X-openmamba
-X-KDE-RootOnly=true
-X-KDE-SubstituteUID=true
-X-KDE-Username=root
+Categories=X-openmamba;

bootrecover/po/es.po

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

bootrecover/po/it.po

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

desktop/desktop-firsttime.sh.in

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# desktop.firsttime - Desktop firsttime script for @distroID@
+#
+# This file is called by startkde after the kpersonalizer has been
+# executed for first access configuration
+#
+# Copyright (c) 2005-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007 by Davide Madrisan <davide.madrisan@gmail.com>
+
+if [ ! -e $HOME/Desktop/.directory ]; then
+
+   case "$LANG" in
+      es*) LANG_ADD=es ;;
+      fr*) LANG_ADD=fr ;;
+      it*) LANG_ADD=it ;;
+      *) LANG_ADD=en ;;
+   esac
+
+   if [ -r @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 ]; then
+      mkdir -p $HOME/Desktop
+      ( cd $HOME/Desktop >/dev/null
+        tar xjf @distrodesktopdir@/desktop-common.tar.bz2
+        tar xjf @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 )
+   fi
+
+   touch $HOME/Desktop/.directory
+
+fi

etc/polkit-1/localauthority.conf.d/60-desktop-policy.conf

@@ -1,10 +0,0 @@
-# Configuration file for the PolicyKit Local Authority.
-#
-# DO NOT EDIT THIS FILE, it will be overwritten on update.
-#
-# See the pklocalauthority(8) man page for more information
-# about configuring the Local Authority.
-#
-
-[Configuration]
-AdminIdentities=unix-group:sysadmin

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

@@ -12,3 +12,24 @@ Action=org.freedesktop.packagekit.*
 ResultAny=yes
 ResultInactive=no
 ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.kde.ufw.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=gufw.daemon.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

etc/prelink.conf.d/skype.conf

@@ -0,0 +1 @@
+-b /usr/bin/skype

etc/xprofile.d/qt-graphicssystem.sh

@@ -0,0 +1 @@
+export QT_GRAPHICSSYSTEM=raster

kde/config/kwinrc

@@ -1,3 +1,6 @@
+[Compositing]
+DisableChecks=true
+
 [Windows]
 ElectricBorders=1
 ElectricBorderDelay=150

mambabase/mambabase-autostart.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambabase/mambabase.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambabase/mambabase.kmdr

@@ -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/curl --connect-timeout 30 -f http://www.openmamba.org/distribution/services/check.html$URL_OPTIONS
+/usr/bin/wget -T 30 http://www.openmamba.org/distribution/services/check.html$URL_OPTIONS -o /dev/null
 RET=$?
 if [ $RET -eq 0 ]; then
    dcop @dcopid KommanderIf setVisible checkButton false

mambabase/mambabase.sh

@@ -92,17 +92,15 @@ if [ "$INSTALL_BASE" = "1" ]; then
    dcop_write $"Removing packages that are no longer needed..." 10
    rpm -q msysklogd >/dev/null && apt_get_parsed remove -y msysklogd
 
-   # first time: remove mamba from user autostart
-   [ -e /home/$USER/.kde/Autostart/mambabase.desktop ] && {
-      rm -f /home/$USER/.kde/Autostart/mambabase.desktop
-      [ -e /home/$USER/.kde/share/config/ktiprc ] && \
-         rm -f /home/$USER/.kde/share/config/ktiprc
-   }
-   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
-      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
-
    dcop_write $"Installing/updating openmamba base packages..." 15
    rpm -q --whatprovides $BASE_PKGS >/dev/null || apt_get_parsed install -y $BASE_PKGS
+
+   # first time: remove mambabase from autostart
+   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
+      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
+   # ugly workaround: don't have permissions to rm file in /etc/xdg/autostart
+   [ -e /etc/xdg/autostart/mambabase.desktop ] && \
+      > /etc/xdg/autostart/mambabase.desktop
 fi
 
 if [ "$INSTALL_UPDATE" = "1" ]; then

mambabase/po/es.po

@@ -102,7 +102,7 @@ msgstr ""
 
 #: _from_rc.cc:17
 msgid "openmamba installation/updates"
-msgstr "instalación/actualización de openmamba"
+msgstr "Instalación/actualización de openmamba"
 
 #: _from_rc.cc:18
 msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"

mambabase/po/it.po

@@ -102,7 +102,7 @@ msgstr ""
 
 #: _from_rc.cc:17
 msgid "openmamba installation/updates"
-msgstr "installazioni/aggiornamenti di openmamba"
+msgstr "Installazioni/aggiornamenti di openmamba"
 
 #: _from_rc.cc:18
 msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"

mambareport/mambareport.desktop

@@ -1,13 +1,13 @@
 [Desktop Entry]
 Name=openmamba system report
-Name[it]=Report del systema openmamba
+Name[it]=Report del sistema openmamba
 GenericName=Creates a system report for debugging
 GenericName[it]=Genera un report del sistema
 Exec=kmdr-executor /usr/share/openmamba/mambareport/mambareport.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambareport/mambareport.kmdr

@@ -850,7 +850,7 @@ problemtext=`echo @problem.text() | sed "s|\"|\\\"|"`
 SYSTEM_MANUFACTURER=`dcop @dcopid KommanderIf text Manufacturer` \
 SYSTEM_PRODUCT_NAME=`dcop @dcopid KommanderIf text Product` \
 SYSTEM_SERIAL_NUMBER=`dcop @dcopid KommanderIf text Serial` \
-kdesudo openmamba-makereport @repdir.text() $HOME $inputfile &> $errfile
+pkexec openmamba-makereport @repdir.text() $HOME $inputfile &> $errfile
 ret=$?
 if [ $ret -eq 0 ]; then
    dcop @dcopid KommanderIf setChecked NextBox true

mambareport/openmamba-makereport

@@ -2,27 +2,24 @@
 #
 # openmamba system report generation tool
 #
-# Copyrgiht (c) 2008-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2008-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
-VERSION=0.7
+VERSION=20110807
 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 ' ' _`
@@ -50,7 +47,7 @@ function catfile() {
 
    FILENAME=$1
    FILEDESC=$2
-   
+
    for c in $FILENAME; do 
       cat >> $TEMPFILE << _EOF
 
@@ -68,25 +65,16 @@ function tailfile() {
 
    FILENAME=$1
    FILEDESC=$2
-   
-   for c in $1; do 
+
+   for c in $1; do
       cat >> $TEMPFILE << _EOF
 
 ****************************************************************
-* File '$c' (first lines): $FILEDESC
+* File '$c' (last 200 lines): $FILEDESC
 ****************************************************************
 _EOF
 
-      head -n 100 ${ROOT}/$c >> $TEMPFILE
-
-      cat >> $TEMPFILE << _EOF
-      
-****************************************************************
-* File '$c' (last lines): $FILEDESC
-****************************************************************
-_EOF
-
-      tail -n 100 ${ROOT}/$c >> $TEMPFILE
+      tail -n 200 ${ROOT}/$c >> $TEMPFILE
    done
 
 }
@@ -138,7 +126,7 @@ _EOF
 }
 
 echo "openmamba report generation tool $VERSION"
-echo "Copyright (c) 2008-2010 by Silvan Calarco"
+echo "Copyright (c) 2008-2011 by Silvan Calarco"
 echo
 
 [ $UID = 0 ] || {
@@ -169,11 +157,12 @@ catfile /etc/openmamba-release "release information"
 catfile /etc/sysconfig/machine "machine information from BIOS"
 catfile /proc/cpuinfo "processor(s) information"
 catfile /proc/meminfo "System memory information"
-catcommand /usr/sbin/lspci -nn "PCI hardware information (short)"
+catcommand "/usr/sbin/lspci -nn" "PCI hardware information (short)"
 catcommand /usr/sbin/lsusb "USB hardware information"
 catcommand /sbin/lsmod "Loadel kernel modules"
 catcommand "rpm -qa|grep kernel-mamba" "Installed kernel packages"
 catcommand "ls -l /etc/alternatives" "System alternatives"
+tailfile /var/log/messages "system messages log"
 
 # process/memory information
 catcommand "top -b -n1" "Top running processes"
@@ -184,33 +173,45 @@ catfile /proc/cmdline "kernel startup command line"
 catcommand "ls -l /boot" "boot files"
 catfile /boot/grub/grub.cfg "GRUB configuration"
 catfile /var/log/dmesg.log "kernel startup messages"
+catcommand /bin/dmesg "last kernel messages"
 catfile "/etc/modprobe.d/*" "modules configuration"
-catinitramfs /boot/initramfs*.img "kernel initial ramdisk"
+catcommand "lsinitrd /boot/initramfs-`uname -r`.img" "running kernel initial ramdisk"
 
 # system boot problems
 catfile /var/log/initd.sysinit.start "system init logfile"
-catfile /var/log/initd.*.start "runlevel init logfile"
+catfile "/var/log/initd.3.start" "runlevel 3 init logfile"
+catfile "/var/log/initd.5.start" "runlevel 5 init logfile"
 catfile /var/log/postplug.log "system configuration tool"
 
-# graphical desktop startup
+# Suspend/Powersave
+catfile /var/log/pm-powersave.log "Current powersave logfile"
+catfile /var/log/pm-suspend.log "Last suspend logfile"
+
+# Graphical subsystem
 catfile /var/log/Xorg.0.log "Xorg startup log"
 catfile /etc/X11/xorg.conf "Xorg configuration"
+catcommand "DISPLAY=:0 /usr/bin/glxinfo" "GLX information"
 tailfile $HOME/.xsession-errors "desktop session log"
 
 # Audio
 catfile "/proc/asound/card*/codec*" "Audio driver codecs"
 catfile "/etc/asound.conf" "Alsa configuration"
-catfile "/etc/asound.state" "Alsa mixer settings"
+catfile "/var/lib/alsa/asound.state" "Alsa mixer settings"
 
 # Network
 catcommand "/sbin/ifconfig -a" "Network interfaces list"
 catcommand "/usr/sbin/iwconfig" "Wireless interfaces list"
 catcommand "/sbin/route -n" "Routing table"
-tailfile "/var/log/wicd/wicd.log" "WICD log file"
 catfile "/etc/sysconfig/network" "General network configuration"
 catfile "/etc/resolv.conf" "DNS configuration"
 
+# Disks
+for d in /dev/sd[a-z]; do
+   catcommand "smartctl -ia $d" "S.M.A.R.T. status for device $d"
+done
+
 # Installation
+catcommand "rpm -qa --last | head -n 100" "Last installed packages"
 catfile "/var/log/install-*" "Installation log"
 catfile /var/log/Xorg.5.log "Xorg installation test log"
 

mambawelcome/mambawelcome-init

@@ -27,6 +27,7 @@ INPUT_FILE=/root/.installer.conf
 #/opt/kde3/bin/dcopserver
 xinit /opt/kde3/bin/kmdr-executor /usr/share/openmamba/mambawelcome/mambawelcome.kmdr -- -br -dpi 100
 #/opt/kde3/bin/dcopserver_shutdown
+killall -9 dcopserver
 
 [ -e /root/.mambawelcome-not-completed ] && {
    rm -f /root/.mambawelcome-not-completed

mambawelcome/mambawelcome.sh

@@ -44,6 +44,10 @@ Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
 
 dcop_write $"Configuring..." 5
 
+# update grub device mappings and config
+[ -e /usr/sbin/grub-mkdevicemap ] && /usr/sbin/grub-mkdevicemap -n
+/usr/sbin/update-grub
+
 [ -r $INPUT_FILE ] || {
    echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
    abort
@@ -115,9 +119,10 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    #mkdir /home/$INSTALL_USER/Desktop
    chmod 711 /home/$INSTALL_USER
    #cp /usr/share/openmamba/installer/*.txt /home/$INSTALL_USER/Desktop/
-   mkdir -p /home/$INSTALL_USER/.kde4/Autostart
-   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
-   chmod 711 /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
+
+   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /etc/xdg/autostart/mambabase.desktop
+   chown $INSTALL_USER /etc/xdg/autostart/mambabase.desktop
+   chmod 644 /etc/xdg/autostart/mambabase.desktop
 
    # create home kde configuration directory
    mkdir -p /home/$INSTALL_USER/.kde4/share/config
@@ -158,10 +163,6 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
    sed -i "s|netbios name =.*|netbios name = $INSTALL_HOSTNAME|" /etc/samba/smb.conf
 }
 
-# update grub device mappings and config
-/usr/sbin/grub-mkdevicemap -n
-/usr/sbin/update-grub
-
 # configure suspend (from suspend rpm post script) and recreate mkinitramfs
 grep path_to_resume_device_file /etc/suspend.conf && {
    SWAPLINE=`/sbin/swapon -s |grep -m1 ^/dev/`

menu/applications/logs/dmesg-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Messaggi del kernel durante l'avvio del sistema
 Comment[fr]=Messages du noyau lors du démarrage du système
 Exec=@distrobindir@/showlog /var/log/dmesg.log "Kernel init messages" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni sull'avvio dei servizi di runlevel 5
 Comment[fr]=Messages au démarrage des services du runlevel 5
 Exec=@distrobindir@/showlog /var/log/initd.5.start "Runlevel 5 init log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel0-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni riguardo all'ultimo spegnimento del sistema
 Comment[fr]=Messages du système lors du dernier arrêt
 Exec=@distrobindir@/showlog /var/log/initd.0.stop "Last shutdown log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel6-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni riguardo all'ultimo riavvio del sistema
 Comment[fr]=Messages du système lors du dernier redémarrage
 Exec=@distrobindir@/showlog /var/log/initd.6.stop "Last reboot log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/sysinit-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Messaggi di avvio del sistema openmamba
 Comment[fr]=Messages au démerrage du système openmamba
 Exec=@distrobindir@/showlog /var/log/initd.sysinit.start "System init log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/netinstall/b43-firmware.desktop.in

@@ -12,7 +12,7 @@ Exec=@bindir@/openmamba-netsrpms b43-firmware
 Icon=network-wireless
 MimeType=
 Path=
-StartupNotify=true
+StartupNotify=false
 Terminal=false
 TerminalOptions=
 Type=Application

menu/applications/netinstall/flashplugin.desktop.in

@@ -12,7 +12,7 @@ Exec=@bindir@/openmamba-netsrpms flashplugin
 Icon=distromenu-flash
 MimeType=
 Path=
-StartupNotify=true
+StartupNotify=false
 Terminal=false
 TerminalOptions=
 Type=Application

menu/applications/netinstall/jre.desktop.pregpl.in

@@ -12,3 +12,4 @@ Comment[fr]=Installation du Java Runtime Environment (JRE) depuis le réseau
 Exec=@bindir@/openmamba-netsrpms jre
 Icon=distromenu-java
 Categories=X-@distroID@-NetInstall;
+StartupNotify=false

menu/applications/netinstall/msttcorefonts.desktop.in

@@ -12,3 +12,4 @@ Comment[fr]=Installation des polices MS TrueType pour le Web
 Exec=@bindir@/openmamba-netsrpms msttcorefonts
 Icon=fonts-package
 Categories=X-@distroID@-NetInstall;
+StartupNotify=false

menu/applications/netinstall/skype.desktop.in

@@ -12,7 +12,7 @@ Exec=@bindir@/openmamba-netsrpms skype
 Icon=distromenu-skype
 MimeType=
 Path=
-StartupNotify=true
+StartupNotify=false
 Terminal=false
 TerminalOptions=
 Type=Application

menu/applications/netinstall/sun-java7.desktop.in

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

menu/applications/netinstall/virtualbox-extension-pack.desktop.in

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

menu/applications/netinstall/win32codecs.desktop.in

@@ -12,3 +12,4 @@ Comment[fr]=Installation et mise à jour des codecs multimédias Win32
 Exec=@bindir@/openmamba-netsrpms win32codecs
 Icon=applications-multimedia
 Categories=X-@distroID@-NetInstall;
+StartupNotify=false

openmamba-update/openmamba-netsrpms

@@ -2,7 +2,7 @@
 #
 # netsrpm-install.sh - Build srpms that download sources from network
 #
-# Copyright (C) 2003-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2003-2012 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>
 
@@ -32,9 +32,7 @@ fi
 function check_if_already_installed() {
    rpm -q $1 &>/dev/null
    if [ $? -eq 0 ]; then
-      notify-send -i $icon "$pckname" "$pckname: "$"already installed."
-   else
-      notify-send -i $icon "$pckname" $"There was an error installing"" $pckname!"
+      notify-send -a $"Network software installation" -i $icon "$pckname" "$pckname: "$"already installed."
    fi
 }
 
@@ -101,35 +99,44 @@ for pckname in $PACKAGES; do
         cpio --quiet --extract --make-directories < $tmpfile ) 2>/dev/null
 
       if [ -f $tmpdir/LICENSE ]; then
-         license-dialog $tmpdir/LICENSE
-         [ $? -ne 0 ] && exit 1
+         if [ "$DISPLAY" ]; then
+            license-dialog $tmpdir/LICENSE
+            [ $? -ne 0 ] && exit 1
+         else
+            echo "You must accept the following license terms:"
+            echo
+            more $tmpdir/LICENSE
+            echo -n "Do you agree with the above license terms [y/N]? "
+            read ans
+            [ "$ans" = "Y" -o "$ans" = "y" ] || exit 1
+         fi
       fi
 
-      notify-send -i $icon "$pckname" $"$pckname installation in progress..."
+      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"
       if [ $? -gt 0 ]; then
          echo "$me: "$"error rebuilding \`$SRPM_PATH'."" "$"Aborting..." >&2
-         check_if_already_installed $pckname
+         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
-      sudo rpm -hUv --force $RPM_PATH
+      sudo smart install -y $RPM_PATH
       if [ $? -gt 0 ]; then
-         echo "$me: "$"error installing \`$SRPM_PATH'."" "$"Aborting..." >&2
+         echo "$me: "$"error installing \`$RPM_PATH'."" "$"Aborting..." >&2
          check_if_already_installed $pckname
          exit 255
       fi
 
       rpm -q $pckname 2>/dev/null
       if [ $? -eq 0 ]; then
-         notify-send -i $icon "$pckname" $"Installation of $pckname successfully completed."
+         notify-send -a $"Network software installation" -i $icon "$pckname" $"Installation of $pckname successfully completed."
       else
-         notify-send -i $icon "$pckname" $"There was an error installing $pckname!"
+         notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing $pckname!"
       fi
       rm -rf $tmpdir $tmpfile
 

usbinstall/po/it.po

@@ -1,85 +0,0 @@
-# Italian translation of openmamba-usbinstall.
-# Copyright (C) 2009 Ercole 'ercolinux' Carpanetto
-# This file is distributed under the same license as the openmamba-usbinstall package.
-# Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>, 2009.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:12+0100\n"
-"PO-Revision-Date: 2009-12-01 23:12+0100\n"
-"Last-Translator: Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>\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"
-
-#: openmamba-usbinstall.sh:25
-msgid ""
-"Warning all the data on the usb key <b>${vendor[$chiave]} ${model[$chiave]}</"
-"b> with <b>${size[$chiave]} GB</b> will be destroyed!"
-msgstr ""
-"Attenzione tutti i dati sulla chiavetta <b>${vendor[$chiave]} ${model[$chiave]}</"
-"b> di <b>${size[$chiave]} GB</b> saranno cancellati!"
-
-#: openmamba-usbinstall.sh:27
-msgid "openmamba installation on USB device"
-msgstr "Installazione di openmamba su dispositivo USB"
-
-#: openmamba-usbinstall.sh:27
-msgid "Starting installation..."
-msgstr "Avvio dell'installazione..."
-
-#: openmamba-usbinstall.sh:32
-msgid "Creating partitions..."
-msgstr "Creazione delle partizioni..."
-
-#: openmamba-usbinstall.sh:51
-msgid "Formatting..."
-msgstr "Formattazione..."
-
-#: openmamba-usbinstall.sh:55
-msgid "Mounting and file creation..."
-msgstr "Montaggio e creazione files..."
-
-#: openmamba-usbinstall.sh:60
-msgid "Verifing files and eventually download from internet..."
-msgstr "Verifica dei files ed eventuale download da internet..."
-
-#: openmamba-usbinstall.sh:63
-msgid ""
-"Please select the 'bootusb' archive or press Cancel to download it"
-msgstr ""
-"Seleziona l'archivio 'bootusb' o premi Cancella per scaricarlo"
-
-#: openmamba-usbinstall.sh:66
-msgid "Please select the ISO image or press Cancel to download it"
-msgstr "Seleziona l'immagine ISO o premi Cancella per scaricarla"
-
-#: openmamba-usbinstall.sh:72
-msgid "Installing files..."
-msgstr "Installazione dei files..."
-
-#: openmamba-usbinstall.sh:76
-msgid "Installing bootloader..."
-msgstr "Installazione del bootloader..."
-
-#: openmamba-usbinstall.sh:79
-msgid "Copying ISO image..."
-msgstr "Copia immagine ISO..."
-
-#: openmamba-usbinstall.sh:116
-msgid "USB key missing"
-msgstr "Chiavetta USB non inserita"
-
-#: openmamba-usbinstall.sh:116
-msgid "Please insert a USB key or press No"
-msgstr "Per favore inserisci una chiavetta USB o premi No"
-
-#: openmamba-usbinstall.sh:128 openmamba-usbinstall.sh:131
-#: openmamba-usbinstall.sh:134
-msgid "Select the USB key on which you want to install openmamba"
-msgstr "Seleziona la chiavetta USB su cui installare openmamba"
-

usbinstall/usbinstall.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=openmamba USB installation
-Name[it]=Installazione di openmamba USB
-GenericName=Prepares an openmamba live system on a USB storage
-GenericName[it]=Prepara una chiavetta USB con openmamba live
-Exec=/usr/share/openmamba/usbinstall/usbinstall.sh
-Icon=mamba
-Terminal=0
-Type=Application
-Categories=X-openmamba
-X-KDE-RootOnly=true
-X-KDE-SubstituteUID=true
-X-KDE-Username=root

usbinstall/usbinstall.sh

@@ -1,149 +0,0 @@
-#!/bin/bash
-# openmamba-usbinstall è uno script per la generazione automatica di una chiavetta di boot per openmamba snapshot.
-# Se i file necessari sono presenti sul disco fisso verranno utilizzati quelli altrimenti
-# scaricherà direttamente la versione attuale dal sito di openmamba.
-# se il file iso è presente nella home verrà usato direttamente altrimenti si aprirà un dialogo dove sarà possibile cercarlo.
-# (c) 2009 ercole 'ercolinux' carpanetto - ercole69@gmail.com
-# (c) 2009-2010 Silvan Calarco - silvan.calarco@mambasoft.it
-# rilasciato secondo la licenza GPL v.3
-
-# per cambiare la versione della snapshot di openmamba modificare il valore qui sotto di conseguenza
-version=20091201
-version_cd=20091201
-fileiso="~/openmamba-livecd-it-snapshot-"$version_cd".i586.iso"
-filecpio=""~/openmamba-bootusb-it-snapshot-"$version".i586.cpio.gz""
-
-#da qui in poi non c'è nulla da modificare
-
-TEXTDOMAIN=usbinstall
-TEXTDOMAINDIR=/usr/share/locale/
-# formattazione della chiavetta e installazione dei file necessari al boot di openmamba
-
-installa(){
-conferma=0
-chiave=$c
-kdialog --title $"openmamba installation on USB device" --yesno $"Warning all the data on the usb key <b>${vendor[$chiave]} ${model[$chiave]}</b> with <b>${size[$chiave]} GB</b> will be destroyed!" && conferma=1
-
-if [ $conferma -eq 1 ]; then
-dcopRef=$(kdialog --geometry 450x140 --title $"openmamba installation on USB device" --progressbar $"Starting installation..." 12) 
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog maximum 20
-
-sudo umount ${device[$chiave]}1
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Creating partitions..."
-sudo fdisk ${device[$chiave]} <<EOF
-d
-4
-d
-3
-d
-2
-d
-n
-p
-1
-1
-
-a
-1
-w
-EOF
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 3
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Formattazione..."
-disk=${device[$chiave]}1
-sudo mkfs.ext3 $disk -L openmamba_live
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 6
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Mounting and file creation..."
-mkdir -p ~/tmpmamba
-sudo mount $disk ~/tmpmamba
-sudo chmod 777 ~/tmpmamba
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 10
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Verifing files and eventually download from internet..."
-file=$filecpio
-if [ ! -f $file ]; then
-file=$(kdialog --title $"Please select the 'bootusb' archive or press Cancel to download it" --getopenfilename $HOME "openmamba*-bootusb-*.cpio.gz |openmamba files")
-echo $file
-if [ ! $file ]; then
-file="~/openmamba-bootusb-it-snapshot-"$version".i586.cpio.gz"
-wget http://www.openmamba.org/pub/openmamba/devel/media/bootusb/it/openmamba-bootusb-it-snapshot-$version.i586.cpio.gz
-fi
-fi
-cd ~/tmpmamba
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 13
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Installing files..."
-gunzip -c < $file | cpio -i
-sudo extlinux --install boot
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 14
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Installing bootloader..."
-sudo install-mbr -e 1 ${device[$chiave]}
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 15
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Copying ISO image..."
-if [ ! -f $fileiso ];then
-fileiso=$(kdialog --title $"Please select the ISO image or press Cancel to download it" --getopenfilename $HOME "openmamba-*.iso |iso files")
-fi
-if [ ! $fileiso ];then
-sudo umount ~/tmpmamba
-cd
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.close
-exit 0
-fi
-cp $fileiso ./
-ln -fs `basename $fileiso` ./openmamba-live.iso
-cd ..
-sudo umount ~/tmpmamba
-fi
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.close
-exit 0
-}
-
-scansione() {
-#scansione di hal alla ricerca di tutte le periferiche di archiviazione usb
-c=0
-for udi in $(/usr/bin/hal-find-by-capability --capability storage)
-do
-    if [[ $(hal-get-property --udi $udi --key storage.removable) = "true" &&
-          $(hal-get-property --udi $udi --key storage.drive_type) = "disk" ]]; then
-	c=$((c+1))
-        device[$c]=$(hal-get-property --udi $udi --key block.device)
-        vendor[$c]=$(hal-get-property --udi $udi --key storage.vendor)
-        model[$c]=$(hal-get-property --udi $udi --key storage.model)
-	parent_udi=$(hal-find-by-property --key block.storage_device --string $udi)
-#        mount[$c]=$(hal-get-property --udi $parent_udi --key volume.mount_point)
-#        label[$c]=$(hal-get-property --udi $parent_udi --key volume.label)
-        media_size[$c]=$(hal-get-property --udi $udi --key storage.removable.media_size)
-        size[$c]=$(( ${media_size[$c]}/(1000*1000*1000)))
-    fi
-done
-if [ $c -eq 0 ]; then
-   t=$(kdialog --title $"USB key missing" --yesno $"Please insert a USB key or press No")
-   if [ ! $t ]; then
-      exit 0 
-   fi
-scansione
-fi
-}
-
-menu(){
-chiave=""
-if [ $c -gt 1 ]; then
-case $c in
-2)
-chiave=$(kdialog --radiolist $"Select the USB key on which you want to install openmamba" 1 "${vendor[1]} ${model[1]} ${size[1]} GB" 1 2 "${vendor[2]} ${model[2]} ${size[2]} GB" 2)
-;; 
-3)
-chiave=$(kdialog --radiolist $"Select the USB key on which you want to install openmamba" 1 "${vendor[1]} ${model[1]} ${size[1]} GB" 1 2 "${vendor[2]} ${model[2]} ${size[2]} GB" 2 3 "${vendor[3]} ${model[3]} ${size[3]} GB" 3)
-;;
-4)
-chiave=$(kdialog --radiolist $"Select the USB key on which you want to install openmamba" 1 "${vendor[1]} ${model[1]} ${size[1]} GB" 1 2 "${vendor[2]} ${model[2]} ${size[2]} GB" 2 3 "${vendor[3]} ${model[3]} ${size[3]} GB" 3 4 "${vendor[4]} ${model[4]} ${size[4]} GB" 4)
-;;
-esac
-if [ ! "$chiave" ]; then
- exit 0
-fi
-fi
-installa
-}
-
-scansione
-menu
-exit 0

xramdr/xramdr.desktop

@@ -6,7 +6,7 @@ Exec=kmdr-executor /usr/share/openmamba/xramdr/xramdr.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root