Release 2023.09.01

Makefile

@@ -6,19 +6,6 @@ include VERSION
 
 ARCH:=`uname -i`
 
-ifeq ($(ARCH), arm)
-SRPMSVERSIONSFILE = SRPMSVERSIONS.arm
-pck_srpms = b43-firmware
-else
-ifeq ($(ARCH), x86_64)
-SRPMSVERSIONSFILE = SRPMSVERSIONS
-pck_srpms = msttcorefonts skype b43-firmware virtualbox-extension-pack \
-            chromium-widevine
-else
-SRPMSVERSIONSFILE = SRPMSVERSIONS
-pck_srpms = msttcorefonts skype b43-firmware virtualbox-extension-pack
-endif
-endif
 PACKAGE = desktop-base-openmamba
 DISTROID = openmamba
 
@@ -26,11 +13,6 @@ RPM_VENDOR = openmamba
 RPM_DISTRIBUTION = openmamba
 RPM_DISTROEXT = mamba
 
-SYSCONFIGFILE = netsrpminstall
-
-#SCREENSAVER = $(DISTROid).desktop
-SCREENSAVER =
-
 DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z)
 DISTROICON = $(DISTROid)
 
@@ -76,8 +58,6 @@ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
 pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
-                          menu/*.in menu/applications/*.in menu/applications/*/*.in \
-                          SRPMS/*/*.in \
                           desktop/*.in)
 pck_sysconfigfile := distroutils.sysconfig
 
@@ -104,8 +84,7 @@ pck_catalogs := $(wildcard openmamba-update/po/*.po)
             s,@libexecdir@,$(libexecdir),g;\
             s,@distrobindir@,$(distrobindir),g;\
             s,@distrodesktopdir@,$(distrodesktopdir),g;\
-            s,@distrosrpmsdir@,$(distrosrpmsdir),g;\
-            s,@screensaver@,${SCREENSAVER},g" $< > $@
+            s,@distrosrpmsdir@,$(distrosrpmsdir),g" $< > $@
 
 all: dist-update locales
 
@@ -137,35 +116,8 @@ install-kde-distro-addons: dist-update
 	cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/
 
-install-distromenu: dist-update
-	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
-	$(INSTALL_DATA) menu/applications/distroutils.directory \
-	   $(DESTDIR)$(xdg_directorydir)/$(DISTROID).directory
-	$(INSTALL_DATA) menu/applications/distroutils-netinstall.directory \
-	   $(DESTDIR)$(xdg_directorydir)/$(DISTROID)-NetInstall.directory
-	@$(INSTALL_DIR) $(DESTDIR)$(xdg_mergedmenudir)
-	$(INSTALL_DATA) menu/applications/distroutils.menu \
-	   $(DESTDIR)$(xdg_mergedmenudir)/$(DISTROid).menu
-	@$(INSTALL_DIR) $(DESTDIR)$(xdg_appsdir)
-	for pck in $(pck_srpms); do\
-	   $(INSTALL_DATA) menu/applications/netinstall/$$pck.desktop \
-	      $(DESTDIR)$(xdg_appsdir)/$(DISTROid)-$$pck.desktop;\
-	done
-
-install-srpms:
-	@$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir)
-	@$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir)
-	@cat $(SRPMSVERSIONSFILE) > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
-	for pck in $(pck_srpms); do\
-	   cp -a SRPMS/$$pck $(DESTDIR)$(distrosrpmsdir); \
-	   rm -f $(DESTDIR)$(distrosrpmsdir)/$$pck/distroutils.sysconfig*; \
-	   rm -f $(DESTDIR)$(distrosrpmsdir)/$$pck/*.spec.in; \
-	   cat SRPMS/$$pck/$(pck_sysconfigfile) >> \
-	      $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE);\
-	done
-
-install-openmamba-makereport:
-	$(INSTALL_SCRIPT) openmamba-makereport/openmamba-makereport $(DESTDIR)$(bindir)
+install-os-makereport:
+	$(INSTALL_SCRIPT) os-makereport/os-makereport $(DESTDIR)$(bindir)
 
 install-desktop:
 	@$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir)
@@ -175,15 +127,12 @@ install-desktop:
 install-openmamba-update:
 	@$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	$(INSTALL_SCRIPT) openmamba-update/openmamba-update $(DESTDIR)$(bindir)
-	$(INSTALL_SCRIPT) openmamba-update/openmamba-netsrpms $(DESTDIR)$(bindir)
 
 install: $(pck_infiles:.in=) \
 	install-kde-distro-addons \
-	install-distromenu \
-	install-srpms \
 	install-desktop \
 	install-openmamba-update \
-	install-openmamba-makereport \
+	install-os-makereport \
 	install-locales
 
 dist: clean

SRPMS/chromium-widevine/chromium-widevine.spec.in

@@ -43,6 +43,7 @@ bsdtar -x --strip-components 4 -f data.tar.xz opt/google/chrome/WidevineCdm
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
 install -d -m0755 %{buildroot}%{_libdir}/chromium/
 cp -a WidevineCdm %{buildroot}%{_libdir}/chromium/
+ln -s WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so %{buildroot}%{_libdir}/chromium/
 
 #cp %{S:0} LICENSE
 
@@ -59,9 +60,13 @@ rm -rf %{_builddir}/%{name}-*
 %{_libdir}/chromium/WidevineCdm/manifest.json
 %{_libdir}/chromium/WidevineCdm/LICENSE
 %{_libdir}/chromium/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
+%{_libdir}/chromium/libwidevinecdm.so
 #%doc LICENSE
 
 %changelog
+* Fri Jun 24 2022 Silvan Calarco <silvan.calarco@mambasoft.it> @SRPMVERSION@-@SRPMRELEASE@
+- provide symlink %{_libdir}/chromium/libwidevinecdm.so for QtWebengine based applications
+
 * Sat Nov 02 2019 Silvan Calarco <silvan.calarco@mambasoft.it> @SRPMVERSION@-@SRPMRELEASE@
 - make library available in the path searched by chromium 78+
 

SRPMSVERSIONS

@@ -1,48 +0,0 @@
-# b43-firmware
-SRPMVERSION["b43-firmware"]=4.150.10.5
-SRPMRELEASE["b43-firmware"]=1mamba
-# flashplugin
-if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "flashplugin" ]; then
-  SRPMVERSION["flashplugin"]="`curl --max-time 20 -sL http://www.adobe.com/software/flash/about/ | grep -A10 "Linux" | grep -A3 "NPAPI" | grep "[0-9]\.[0-9]\.[0-9]" | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
-  SRPMRELEASE["flashplugin"]=1mamba
-fi
-# msttcorefonts
-SRPMVERSION["msttcorefonts"]=1.3
-SRPMRELEASE["msttcorefonts"]=7mamba
-# skype
-if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "skype" ]; then
-  SRPMVERSION["skype"]="`curl --max-time 20 -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|"|grep -v "\.\.0\." 2>/dev/null`"
-  SRPMRELEASE["skype"]=2mamba
-fi
-# spotify
-if [ "`uname -m`" == "x86_64" ]; then
-SRPMVERSION["spotify"]=20150629
-else
-SRPMVERSION["spotify"]=0
-fi
-SRPMRELEASE["spotify"]=1mamba
-# sun-java
-if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java8" -o "$SRPMCHECK" = "sun-java" ]; then
-  SRPMVERSION["sun-java"]="`curl --max-time 20 -sL https://www.oracle.com/technetwork/java/javase/downloads/jdk12-downloads-5295953.html|grep "linux-x64_bin.tar.gz"|tail -n1|sed "s|.*jdk-\([.0-9-]*\).*|\1|;s|-|_|" 2>/dev/null`"
-  SRPMRELEASE["sun-java"]=1mamba
-fi
-# virtualbox-extension-pack
-if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "virtualbox-extension-pack" ]; then
-  SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`"
-  SRPMRELEASE["virtualbox-extension-pack"]=2mamba
-fi
-# win32codecs
-SRPMVERSION["win32codecs"]=20110131
-SRPMRELEASE["win32codecs"]=1mamba
-# chromium-pepper-flash
-if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "chromium-pepper-flash" ]; then
-  SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -sL http://www.adobe.com/software/flash/about/ | grep -A15 "Linux" | grep -A3 "Opera.*PPAPI" | grep "[0-9]\.[0-9]\.[0-9]" | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
-  SRPMRELEASE["chromium-pepper-flash"]=1mamba
-fi
-# chromium-widevine
-if [ "`uname -m`" == "x86_64" ]; then
-   SRPMVERSION["chromium-widevine"]="`rpm -q chromium | sed "s|chromium-\([0-9.]*\).*|\1|"`"
-else
-   SRPMVERSION["chromium-widevine"]="0"
-fi
-SRPMRELEASE["chromium-widevine"]=3mamba

SRPMSVERSIONS.arm

@@ -1,5 +0,0 @@
-# sun-java7
-if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
-SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
-SRPMRELEASE["sun-java7"]=1mamba
-fi

VERSION

@@ -1 +1 @@
-VERSION = 2022.06.19
+VERSION = 2023.09.01

bootrecover.lang

@@ -1,2 +0,0 @@
-%lang(es) /opt/kde3/share/locale/es/LC_MESSAGES/bootrecover.mo
-%lang(it) /opt/kde3/share/locale/it/LC_MESSAGES/bootrecover.mo

etc/sudoers.d/dnf

@@ -0,0 +1,5 @@
+# DNF install/update without password for sysadmin or packager groups
+Cmnd_Alias DNF_CMD = /usr/bin/dnf update, /usr/bin/dnf install *
+
+%packager ALL = NOPASSWD: DNF_CMD
+%sysadmin ALL = NOPASSWD: DNF_CMD

etc/sudoers.d/yum

@@ -1,5 +0,0 @@
-# Yum install/update without password for sysadmin or packager groups
-Cmnd_Alias YUM_CMD = /usr/bin/yum update, /usr/bin/yum install *
-
-%packager ALL = NOPASSWD: YUM_CMD
-%sysadmin ALL = NOPASSWD: YUM_CMD

menu/applications/distroutils-logs.directory.in

@@ -1,12 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=System start logs
-Name[es]=Inicio del sistema
-Name[it]=Avvio del sistema
-Name[fr]=Démarrage du système
-Comment=Information on system startup
-Comment[es]=Mensajes de inicio del sistema
-Comment[it]=Informazioni sull'avvio del sistema
-Comment[fr]=Informations du démarrage du système
-Icon=utilities-log-viewer

menu/applications/distroutils-netinstall.directory.in

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=Network software installation
-Name[es]=Instala el software por red
-Name[it]=Installazione di software dalla rete
-Name[fr]=Installation du logiciel depuis le réseau
-Icon=distromenu-netinstall

menu/applications/distroutils.directory.in

@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Directory
-Name=@distroID@
-Icon=@distroicon@
-SortOrder=

menu/applications/distroutils.menu.in

@@ -1,18 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<Menu><Name>Applications</Name>
- <Menu><Name>System</Name>
-  <Menu><Name>@distroID@</Name>
-    <Directory>@distroID@.directory</Directory>
-    <Include><Category>X-@distroID@</Category></Include>
-      <Menu><Name>Network software installation</Name>
-        <Directory>@distroID@-NetInstall.directory</Directory>
-        <Include><Category>X-@distroID@-NetInstall</Category></Include>
-      </Menu>
-      <Menu><Name>System start logs</Name>
-        <Directory>@distroID@-Logs.directory</Directory>
-        <Include><Category>X-@distroID@-Logs</Category></Include>
-      </Menu>
-  </Menu>
- </Menu>
-</Menu>

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

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

menu/applications/netinstall/chromium-pepper-flash.desktop.in

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Google Chrome's pepper-flash plugin
-Name[it]=Plugin pepper-flash da Google Chrome
-Comment=Install pepper-flash plugin from network
-Comment[it]=Installa il plugin pepper-flash dalla rete
-Encoding=UTF-8
-Exec=@bindir@/openmamba-netsrpms chromium-pepper-flash
-Icon=distromenu-chromium
-MimeType=
-Path=
-StartupNotify=false
-Terminal=false
-TerminalOptions=
-Type=Application
-Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/chromium-widevine.desktop.in

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Google Chrome's Widevine plugin
-Name[it]=Plugin Widevine da Google Chrome
-Comment=Install Widevine plugin from network
-Comment[it]=Installa il plugin Widevine dalla rete
-Encoding=UTF-8
-Exec=@bindir@/openmamba-netsrpms chromium-widevine
-Icon=distromenu-chromium
-MimeType=
-Path=
-StartupNotify=false
-Terminal=false
-TerminalOptions=
-Type=Application
-Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/flashplugin.desktop.in

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

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

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Install Java Runtime Environment (JRE)
-Name[es]=Instala el Runtime Environment (JRE)
-Name[it]=Installa il Java Runtime Environment (JRE)
-Name[fr]=Installation du Java Runtime Environment (JRE)
-Comment=Install Java Runtime Environment (JRE) from network
-Comment[es]=Instala el Java Runtime Environment (JRE) por red
-Comment[it]=Installa il Java Runtime Environment (JRE) dalla rete
-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

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Install MS TrueType Core fonts
-Name[es]=Instala las fuentes MS TrueType
-Name[it]=Installa i font MS TrueType
-Name[fr]=Installation des polices MS TrueType
-Comment=Install MS TrueType Core Fonts for the Web
-Comment[es]=Instala las fuentes MS TrueType para el Web
-Comment[it]=Installa i font MS TrueType per il Web
-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

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

menu/applications/netinstall/spotify.desktop.in

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

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

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

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

@@ -1,19 +0,0 @@
-[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

@@ -1,15 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=Install/update Win32 Codecs
-Name[es]=Instala y pon al día los Win32 codecs
-Name[it]=Installa ed aggiorna i Win32 codec
-Name[fr]=Installation et mise à jour des codecs Win32
-Comment=Install the multimedia win32 codecs
-Comment[es]=Instala y pon al día los Win32 codecs multimediales
-Comment[it]=Installa ed aggiorna i codec multimediali Win32
-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

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

openmamba-update/po/it.po

@@ -1,3 +1,21 @@
+# openmamba update translations.
+# Copyright (C) 2011-2023 openmamba
+# Silvan Calarco <silvan.calarco@mambasoft.it>, 2011-2023
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 1.90\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-19 12:53+0200\n"
+"PO-Revision-Date: 2011-04-26 18:37+CEST\n"
+"Last-Translator: Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+
 #: openmamba-netsrpms:21
 msgid "Error: invalid option $1; aborting."
 msgstr "Errore: opzione $1 non valida; uscita."

os-makereport/os-makereport

@@ -1,14 +1,15 @@
 #!/bin/bash
 #
-# openmamba system report generation tool
+# GNU/Linux O.S. report generation tool
 #
 # Copyright (c) 2008-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 
-VERSION=20220618
+MAKEREPORT_VERSION=20220728
 TEMPFILE=`mktemp`
 
 . ${ROOT}/etc/sysconfig/machine
+. ${ROOT}/etc/os-release
 
 [ ! "$SYSTEM_MANUFACTURER" -o "$SYSTEM_MANUFACTURER" = "System manufacturer" ]  && {
    SYSTEM_MANUFACTURER=unknown
@@ -26,7 +27,7 @@ SYSTEM_MANUFACTURER=`echo $SYSTEM_MANUFACTURER | tr ' ' _ | tr '-' _ | tr '/' _`
 SYSTEM_PRODUCT_NAME=`echo $SYSTEM_PRODUCT_NAME | tr ' ' _ | tr '-' _ | tr '/' _`
 SYSTEM_SERIAL_NUMBER=`echo $SYSTEM_SERIAL_NUMBER | tr ' ' _ | tr '-' _ | tr '/' _`
 
-REPORTNAME="openmamba-report-$SYSTEM_MANUFACTURER-$SYSTEM_PRODUCT_NAME-$SYSTEM_SERIAL_NUMBER.txt"
+REPORTNAME="${NAME}-report-$SYSTEM_MANUFACTURER-$SYSTEM_PRODUCT_NAME-$SYSTEM_SERIAL_NUMBER.txt"
 
 if [ "$1" ]; then
    NOTE="$1"
@@ -118,8 +119,8 @@ _EOF
 
 }
 
-echo "openmamba report generation tool $VERSION"
-echo "Copyright (c) 2008-2022 by Silvan Calarco <info@openmamba.org>"
+echo "${NAME} report generation tool ${MAKEREPORT_VERSION}"
+echo "Copyright (c) 2008-2022 by Silvan Calarco <silvan.calarco@mambasoft.it>"
 echo
 
 [ $UID = 0 ] || {
@@ -127,13 +128,12 @@ echo
    exit 1
 }
 
+
 echo "Gathering information..."
 
-
-
 cat > $TEMPFILE << _EOF
 ****************************************************************************
-* openmamba diagnostic information $VERSION for host $HOSTNAME (`date`)
+* ${NAME} diagnostic information ${MAKEREPORT_VERSION} for host $HOSTNAME (`date`)
 ****************************************************************************
 _EOF
 
@@ -146,14 +146,14 @@ echo >> $TEMPFILE
 fi
 
 # system information
-catfile /etc/openmamba-release "release information"
+catfile /etc/os-release "O.S. 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/bin/lspci -nn" "PCI hardware information (short)"
 catcommand /usr/bin/lsusb "USB hardware information"
-catcommand /sbin/lsmod "Loadel kernel modules"
-catcommand "rpm -qa|grep kernel-mamba" "Installed kernel packages"
+catcommand /usr/sbin/lsmod "Loadel kernel modules"
+catcommand "rpm -qa|grep ^kernel-" "Installed kernel packages"
 catcommand "ls -l /etc/alternatives" "System alternatives"
 
 # kernel and system logs
@@ -193,14 +193,14 @@ catfile "/etc/asound.conf" "Alsa configuration"
 catfile "/var/lib/alsa/asound.state" "Alsa mixer settings"
 
 # Network
-catcommand "/sbin/ifconfig -a" "Network interfaces list"
+catcommand "/usr/sbin/ifconfig -a" "Network interfaces list"
 catcommand "/usr/sbin/iwconfig" "Wireless interfaces list"
-catcommand "/sbin/route -n" "Routing table"
+catcommand "/usr/sbin/route -n" "Routing table"
 catcommand "systemd-resolve --status" "DNS configuration"
 
 # Disks
-for d in /dev/sd[a-z]; do
-   catcommand "smartctl -ia $d" "S.M.A.R.T. status for device $d"
+for d in /dev/{sd[a-z],nvme[0-9]}; do
+   [ -e $d ] && catcommand "smartctl -ia $d" "S.M.A.R.T. status for device $d"
 done
 
 # Installation
@@ -208,11 +208,11 @@ catcommand "rpm -qa --last | head -n 100" "Last installed packages"
 catfile /var/log/Xorg.5.log "Xorg installation test log"
 
 # Other details
-catcommand "/usr/sbin/lspci -vv" "PCI hardware information (verbose)"
+catcommand "/usr/bin/lspci -vv" "PCI hardware information (verbose)"
 
 cp $TEMPFILE $REPORTNAME || exit 1
 chmod +r $REPORTNAME
 rm -f $TEMPFILE
 
 echo "Report saved as $REPORTNAME"
-echo "Please send this report to reports@openmamba.org."
+echo "Please visit $BUG_REPORT_URL for instructions to submit this report."

usbinstall.lang

@@ -1 +0,0 @@
-%lang(it) /usr/share/locale/it/LC_MESSAGES/usbinstall.mo