Release 1.6.3

Makefile

@@ -1,5 +1,5 @@
 # Makefile for autodist
-# Copyright (C) 2006-2021 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2006-2025 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 PACKAGE = autodist
 
@@ -38,7 +38,6 @@ distdir = $(PACKAGE)-$(VERSION)
 dist_archive = $(distdir).tar.bz2
 
 default:
-	@sed -i "s|^VERSION=.*|VERSION=$(VERSION)|" autodist autoport
 
 install-dirs:
 	@$(INSTALL_DIR) $(DESTDIR)$(configdir)/scripts
@@ -91,6 +90,7 @@ install-programs:
 	@$(INSTALL_SCRIPT) telegram/openmamba_bot.py $(DESTDIR)$(pck_datadir)/openmamba_bot.py
 	@$(INSTALL_SCRIPT) telegram/requirements.txt $(DESTDIR)$(pck_datadir)/requirements.txt
 	@$(INSTALL_SCRIPT) repology-openmamba.py $(DESTDIR)$(pck_datadir)/repology-openmamba.py
+	@$(INSTALL_DATA) VERSION $(DESTDIR)$(pck_datadir)/VERSION
 	@cp -a webbuild/html/* $(DESTDIR)$(htmldir)
 
 install-data:

VERSION

@@ -1 +1 @@
-VERSION = 1.6.0
+VERSION=1.6.3

autodist

@@ -1,18 +1,20 @@
 #!/bin/bash
 #
 # Autodist -- batch build tool for RPM based distributions
-# Copyright (C) 2006-2016 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2006-2025 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=1.6.0
-me=(${0##*/} $VERSION "Tue Jan 26 2016")
+. /usr/share/autodist/VERSION
+me=(${0##*/} $VERSION)
 exec 3>`readlink /proc/self/fd/0`
 
+BASE_REPOSITORY=base
+
 function usage() {
    echo "\
 ${me[0]} ${me[1]}
-"$"Copyright (C) 2006-2016 Silvan Calarco <silvan.calarco@mambasoft.it>""
+"$"Copyright (C) 2006-2025 Silvan Calarco <silvan.calarco@mambasoft.it>""
 "$"Released under the terms of the GNU GPL v3 license"
    echo "
 "$"Batch build tool for bulding a whole distribution and much more.""
@@ -915,10 +917,10 @@ function log_date() {
 
 DISTDBFILES=
 
-DISTDB=`fetch_repository_file ${AUTODIST_REPOSITORY/-*}/distdb`
+DISTDB=`fetch_repository_file ${LOCAL_REPS_BASE_DIR}/${BASE_REPOSITORY}/distdb`
 [ "$DISTDB" ] && DISTDBFILES="$DISTDB"
 
-DISTDBARCH=`fetch_repository_file ${AUTODIST_REPOSITORY/-*}/distdb.$TARGETARCH`
+DISTDBARCH=`fetch_repository_file ${LOCAL_REPS_BASE_DIR}/${BASE_REPOSITORY}/distdb.$TARGETARCH`
 if [ "$DISTDBARCH" ]; then
    DISTDBFILES="$DISTDBFILES $DISTDBARCH"
 fi
@@ -994,7 +996,7 @@ BUILDSLIST=`fetch_repository_file distromatic/$AUTODIST_REPOSITORY/builds-$TARGE
 [ "$AUTODIST_DELAYED_REPOSITORY" ] && BUILDSLIST_DELAYED=`fetch_repository_file distromatic/$AUTODIST_DELAYED_REPOSITORY/builds-$TARGETARCH`
 [ $? -eq 0 ] || echo "Warning: unable to fetch $BUILDSLIST">&2
 
-LEGACYLIST=`fetch_repository_file ${AUTODIST_REPOSITORY/-*}/legacy`
+LEGACYLIST=`fetch_repository_file ${LOCAL_REPS_BASE_DIR}/${BASE_REPOSITORY}/legacy`
 [ "$LEGACYLIST" ] || LEGACYLIST=$SYSCONFDIR/legacy
 [ $? -eq 0 ] || echo "Warning: unable to fetch $LEGACYLIST">&2
 

autodist-git

@@ -112,8 +112,8 @@ def commitReleaseFromDir(options, pkg_info, gitea_repo, repo, temp_dir):
             stdout=subprocess.PIPE, check=False)
         # Delete binary source archives
         for pattern in [
-            '*.zip','*.tar.bz2','*.tar.xz','*.tar.gz','*.tgz','*.txz','*.iso',
-            '*.run','*.dll','*.bin','*.jar','*.msi','*.deb']:
+            '*.zip','*.tar.bz2','*.tar.xz','*.tar.gz','*.tar.lz','*.tgz','*.txz',
+            '*.iso','*.run','*.dll','*.bin','*.jar','*.msi','*.deb','*.rpm']:
             for filename in glob.glob(f'{src_dir}/{pattern}'):
                 os.remove(filename)
 

autoport

@@ -1,22 +1,22 @@
 #!/bin/bash
 # autoport -- batch cross-build tool based on autodist
-# Copyright (C) 2011-2024 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2011-2025 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPL release 3 license
 #
-VERSION=1.6.0
+. /usr/share/autodist/VERSION
 
 BASE_REPOSITORY=base
 PORT_REPOSITORY=base
 
 . /etc/autodist/config
 
-me=(${0##*/} $VERSION "Sat Mar 20 2011")
+me=(${0##*/} $VERSION)
 
 function usage() {
    echo "\
 ${me[0]} ${me[1]}
-"$"Copyright (C) 2011-2023 Silvan Calarco <silvan.calarco@mambasoft.it>""
+"$"Copyright (C) 2011-2025 Silvan Calarco <silvan.calarco@mambasoft.it>""
 "$"Released under the terms of the GNU GPL v3 license"
    echo "
 "$"Batch port and cross-build tool based on autodist.""

etc/autodist/scripts/update-specfile

@@ -54,7 +54,10 @@ done
 # Distribution global changes
 sed -i "s|^Vendor:.*|Vendor:        openmamba|;
         s|^Distribution:.*|Distribution:  openmamba|;
-        /^%debug_package$/d;
+        /^%debug_package.*/d;
+        /^#%patch.*/d;
+        s|^%patch -p|%patch 0 -p|;
+        s|^%patch0|%patch 0|;
         /BuildRequires:[[:space:]]*libffmpeg-devel/d;
         /^BuildRequires:[[:space:]]*libkdegames-devel/d;
         /^BuildRequires:[[:space:]]*libkdegames5-devel/d;

webbuild/html/styles/webbuild.css

@@ -327,7 +327,7 @@ input#repsearchtext {
    width:100% !important;
    height:350px;
    overflow:auto;
-   overflow-x:hidden;
+   overflow-x:auto;
    word-wrap: break-word;
    font-family:monospace;
    font-size:9pt;
@@ -369,6 +369,11 @@ input#repsearchtext {
    color:white;
 }
 
+.outputbox > pre {
+   white-space: pre-wrap;
+   word-break: break-word;
+}
+
 .outputbox > pre > p {
    background-color:gray;
    color:white;

webbuild/webbuild-sudo

@@ -93,10 +93,10 @@ if [ "$MODE" = "specinfo" ]; then
          echo "SPECVAR_Specfile=\"$SPECFILE\""
          # Resolve builddir by parsing %setup macro or use default
          BUILDDIR_UNPARSED=`grep "^%setup" ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec | sed "s|.*-n \([^[:space:]]*\).*|\1|"`
-         if [ ! "$BUILDDIR_UNPARSED" ]; then
+         if [ "${BUILDDIR_UNPARSED/%setup}" != "${BUILDDIR_UNPARSED}" ]; then
             BUILDDIR_UNPARSED="$PACKAGE-%{version}"
          fi
-         BUILDDIR=`rpmspec -q --srpm --queryformat \"${BUILDDIR_UNPARSED}\" ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec`
+         BUILDDIR=`rpmspec -q --srpm --queryformat "${BUILDDIR_UNPARSED}" ${WORKINGHOME}/RPM/SPECS/$PACKAGE.spec`
          while read line; do
             set -- $line
             [ "$1" = "%package" -o "$1" = "%description" ] && break