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

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

ghc.spec

@@ -11,8 +11,11 @@
 # build hadrian for production builds:
 %bcond build_hadrian 1
 
+# disabled to allow parallel install of ghc9.2-9.2.7 and ghc-9.2.6
+%if 0
 %global ghc_major 9.2
 %global ghc_obsoletes_name ghc%{ghc_major}
+%endif
 
 # to handle RCs
 %global ghc_release %{version}
@@ -78,8 +81,10 @@
 %endif
 
 %global obsoletes_ghcXY() \
+%if %{defined ghc_obsoletes_name}\
 Obsoletes: %{ghc_obsoletes_name}%{?1:-%1} < %{version}-%{release}\
 Provides: %{ghc_obsoletes_name}%{?1:-%1} = %{version}-%{release}\
+%endif\
 %{nil}
 
 Name: ghc
@@ -88,7 +93,7 @@ Version: 9.2.6
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 129.3.riscv64%{?dist}
+Release: 130.0.riscv64%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: BSD and HaskellReport
@@ -450,11 +455,6 @@ rm libffi-tarballs/libffi-*.tar.gz
 %patch15 -p1 -b .orig
 %patch16 -p1 -b .orig
 %endif
-# workaround before 5725 hadrian fix
-# https://gitlab.haskell.org/ghc/ghc/-/issues/19825
-%ifarch ppc64le
-%patch16 -p1 -b .orig
-%endif
 
 # bigendian
 %ifarch s390x
@@ -747,6 +747,7 @@ done
 )
 %endif
 
+%if %{defined ghc_major}
 (
 cd %{buildroot}%{_bindir}
 for i in *; do
@@ -759,6 +760,7 @@ for i in *; do
     esac
 done
 )
+%endif
 
 # bash completion
 mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
@@ -831,6 +833,7 @@ make test
 %postun base -p /sbin/ldconfig
 %endif
 
+
 %transfiletriggerin compiler -- %{ghcliblib}/package.conf.d
 %ghc_pkg_recache
 %end
@@ -873,6 +876,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
 %{_bindir}/runghc-%{ghc_version}
 %{_bindir}/runhaskell
 %{_bindir}/runhaskell-%{version}
+%if %{defined ghc_major}
 %{_bindir}/ghc-%{ghc_major}
 %{_bindir}/ghc-pkg-%{ghc_major}
 %{_bindir}/ghci-%{ghc_major}
@@ -883,6 +887,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
 %{_bindir}/hpc-%{ghc_major}
 %{_bindir}/hsc2hs-%{ghc_major}
 %endif
+%endif
 %dir %{ghclibdir}/bin
 %{ghclibdir}/bin/ghc
 %{ghclibdir}/bin/ghc-iserv
@@ -1000,12 +1005,12 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
 
 
 %changelog
-* Thu Mar 09 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-129.3.riscv64
-- Bump
-
-* Thu Mar 02 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-129.0.riscv64
+* Thu Apr 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-130.0.riscv64
 - Disable ld.gold on riscv64 (not supported)
 
+* Mon Mar 13 2023 Jens Petersen <petersen@redhat.com> - 9.2.6-130
+- allow parallel installing ghc9.2-9.2.7
+
 * Fri Feb 17 2023 Jens Petersen <petersen@redhat.com> - 9.2.6-129
 - upstream patch to enable SMP rts for ppc64le