From 588819da30d1e4875a3460b3f59c5b809af01373 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 5 Feb 2024 09:02:45 +0100
Subject: helpers for noarch using 8.2

---
 buildfct | 80 ++++++++++++++++++++++++++++++----------------------------------
 pkgup    | 10 ++++++--
 2 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/buildfct b/buildfct
index ccccdb0..635d386 100644
--- a/buildfct
+++ b/buildfct
@@ -176,6 +176,7 @@ alias mockel8x80="             mock --configdir=$mocketc -r el8x80             r
 alias mockel8x81="             mock --configdir=$mocketc -r el8x81             rebuild "
 alias mockel8n81="             mock --configdir=$mocketc -r el8n81             rebuild "
 alias mockel8x82="             mock --configdir=$mocketc -r el8x82             rebuild "
+alias mockel8n82="             mock --configdir=$mocketc -r el8n82             rebuild "
 alias mockel8x83="             mock --configdir=$mocketc -r el8x83             rebuild "
 alias mockel8xscl56="          mock --configdir=$mocketc -r el8xscl56          rebuild "
 alias mockel8xscl70="          mock --configdir=$mocketc -r el8xscl70          rebuild "
@@ -201,6 +202,7 @@ alias mockel9x80="             mock --configdir=$mocketc -r el9x80             r
 alias mockel9x81="             mock --configdir=$mocketc -r el9x81             rebuild "
 alias mockel9n81="             mock --configdir=$mocketc -r el9n81             rebuild "
 alias mockel9x82="             mock --configdir=$mocketc -r el9x82             rebuild "
+alias mockel9n82="             mock --configdir=$mocketc -r el9n82             rebuild "
 alias mockel9x83="             mock --configdir=$mocketc -r el9x83             rebuild "
 alias mockel9xscl74="          mock --configdir=$mocketc -r el9xscl74          rebuild "
 alias mockel9xscl80="          mock --configdir=$mocketc -r el9xscl80          rebuild "
@@ -373,6 +375,42 @@ else
 fi
 }
 
+# Build All distribution / version / noarch for remi using PHP >= 8.2
+mock82n()
+{
+quiet="--quiet"
+if [ "$1" = "-q" ]; then
+    shift
+fi
+
+if [ -f "$1" ]; then
+  date +%X
+  pids=""
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc39x     rebuild "$@" && echo "$(date +%X) (82) fc39  Ok." || echo "fc38 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc38x     rebuild "$@" && echo "$(date +%X) (82) fc38  Ok." || echo "fc38 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r fc37x     rebuild "$@" && echo "$(date +%X) (81) fc37  Ok." || echo "fc37 Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el7x --enablerepo=remi-php82 rebuild "$@" && echo "$(date +%X) (81) el7   Ok." || echo "el7  Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el8n82    rebuild "$@" && echo "$(date +%X) (81) el8   Ok." || echo "el8  Error !")&
+    pids="$pids $!"
+    echo -n ""
+    (mock $quiet --configdir=$mocketc -r el9n82    rebuild "$@" && echo "$(date +%X) (81) el9   Ok." || echo "el9  Error !")&
+    pids="$pids $!"
+  wait $pids
+  date +%X
+else
+  echo "file not found '$1'"
+fi
+}
+
 # Build All distribution / version / 64bits for remi/remi-php55
 mock55x()
 {
@@ -572,48 +610,6 @@ else
 fi
 }
 
-# Build All distribution / version / 64bits for remi/scl-php82
-mockscl83el()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 7 8 9
-  do
-    echo -n "$(date +%X) scl83 el$i  "
-    mock $quiet --configdir=$mocketc -r el${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
-# Build All distribution / version / 64bits for remi/scl-php82
-mockscl83fc()
-{
-quiet=""
-if [ "$1" = "-q" ]; then
-    quiet="--quiet"
-    shift
-fi
-
-if [ -f "$1" ]; then
-  for i in 37 38 39
-  do
-    echo -n "$(date +%X) scl83 fc$i "
-    mock $quiet --configdir=$mocketc -r fc${i}xscl83 rebuild "$@" && echo " Ok." || echo " Error !"
-  done
-  date +%X
-else
-  echo "file not found '$1'"
-fi
-}
-
 # Build All distribution / version / 64bits for remi/scl-php82
 mockscl82x()
 {
diff --git a/pkgup b/pkgup
index 0cdbc52..4ae31ce 100755
--- a/pkgup
+++ b/pkgup
@@ -6,13 +6,18 @@ rpmdate=${rpmdate/ 0/  }
 name=$(basename $PWD)
 
 if [ $# -lt 2 ]; then
-	echo "usage $0 version commit"
+	echo "usage $0 version commit [ date [ spec ]]"
     exit 1
 fi
 if [ x$3 = x ]; then
+   date=$(date +%Y-%m-%d)
+else
+   date=$3
+fi
+if [ x$4 = x ]; then
    name=$(basename $PWD)
 else
-   name=$(basename $3 .spec)
+   name=$(basename $4 .spec)
 fi
 
 sed --regexp-extended \
@@ -20,6 +25,7 @@ sed --regexp-extended \
     --expression "/github_version/s/[0-9.]+$/$1/" \
     --expression "/upstream_version/s/[0-9.]+$/$1/" \
     --expression "/(github|gh)_commit/s/[0-9a-f]{40}$/$2/" \
+    --expression "/(github|gh)_date/s/[0-9\-]{10}$/$date/" \
     --expression '/^Release:/s/[0-9.]+/1/' \
     --expression "s/%changelog/%changelog\n* $rpmdate $vendor - $1-1\n- update to $1\n/" \
     --in-place $name.spec
-- 
cgit