Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

ghc-rpm-macros.spec

@@ -8,7 +8,7 @@
 
 Name:           ghc-rpm-macros
 Version:        2.6.5
-Release:        1.0.riscv64%{?dist}
+Release:        3.0.riscv64%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPL-3.0-or-later
@@ -185,10 +185,16 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
 
 
 %changelog
-* Mon Nov 20 2023 David Abdurachmanov <davidlt@rivosinc.com> - 2.6.5-1.0.riscv64
+* Tue Feb 13 2024 David Abdurachmanov <davidlt@rivosinc.com> - 2.6.5-3.0.riscv64
 - Set -j to 1 on riscv64
 - Reduce warning verbosity on riscv64
 
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Nov 12 2023 Jens Petersen <petersen@redhat.com> - 2.6.5-1
 - ghc-deps.sh: ghc-9.8 prof fixes adapted from mimi1vx (opensuse)
 - improve ghc-info.sh with a show mode

tests/test-rebuild.sh

@@ -23,17 +23,19 @@ ARCH=$(arch)
 
 if [ -f /etc/os-release ]; then
     eval $(grep VERSION_ID /etc/os-release)
-    if git branch -a | grep -q f$VERSION_ID; then
-        BRANCH=f$VERSION_ID
+    if rpm -q --quiet epel-release; then
+        PREFIX=epel
+    else
+        PREFIX=f
+    fi
+    if git branch -a | grep -q $PREFIX$VERSION_ID; then
+        BRANCH=$PREFIX$VERSION_ID
     else
         case $VERSION_ID in
             7.*) BRANCH=epel7 ;;
             *) BRANCH=rawhide ;;
         esac
     fi
-else
-# assume RHEL6
-    BRANCH=el6
 fi
 
 if [ "* $BRANCH" != "$(git branch | grep '^*')" ]; then