public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jens Petersen <petersen@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/ghc9.10] f44: update platform paths for ghc-9.10 with ghc-rpm-macros-2.11
Date: Tue, 09 Jun 2026 07:14:23 GMT [thread overview]
Message-ID: <178098926339.1.10238298480541811054.rpms-ghc9.10-dfacb488a4ab@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ghc9.10
Branch : f44
Commit : dfacb488a4ab1f71f6c89021865b9eaa35d51a26
Author : Jens Petersen <petersen@redhat.com>
Date : 2026-02-14T19:31:36+08:00
Stats : +9/-6 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/ghc9.10/c/dfacb488a4ab1f71f6c89021865b9eaa35d51a26?branch=f44
Log:
update platform paths for ghc-9.10 with ghc-rpm-macros-2.11
---
diff --git a/ghc9.10.spec b/ghc9.10.spec
index 8f24ff3..529c2e3 100644
--- a/ghc9.10.spec
+++ b/ghc9.10.spec
@@ -76,7 +76,7 @@ Version: %{ghc_major}.%{ghc_patchlevel}
# - 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: 12%{?dist}
+Release: 13%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD-3-Clause AND HaskellReport
@@ -544,7 +544,7 @@ make install
%if "%{?_ghcdynlibdir}" != "%_libdir"
mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
-echo "%{ghclibplatform}" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+echo "%{ghclibplatform}*" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}.conf
%else
for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \; -print); do
chrpath -d $i
@@ -576,7 +576,7 @@ done
echo "%%dir %{ghclibdir}" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
echo "%%dir %{ghcliblib}" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
-echo "%%dir %ghclibplatform" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
+echo "%%dir %{ghclibplatform}*" >> %{name}-base%{?_ghcdynlibdir:-devel}.files
%ghc_gen_filelists ghc %{ghc_version_override}
%ghc_gen_filelists ghc-bignum %{ghc_bignum_ver}
@@ -604,7 +604,7 @@ echo "%{_sysconfdir}/ld.so.conf.d/%{name}.conf" >> %{name}-base.files
%endif
# add rts libs
-for i in %{buildroot}%{ghclibplatform}/libHSrts*ghc%{ghc_version}.so; do
+for i in %{buildroot}%{ghclibplatform}*/libHSrts*ghc%{ghc_version}.so; do
if [ "$(basename $i)" != "libHSrts-%{rts_ver}-ghc%{ghc_version}.so" ]; then
echo $i >> %{name}-base.files
fi
@@ -643,7 +643,7 @@ rm %{buildroot}%{ghcliblib}/package.conf.d/.stamp
rm %{buildroot}%{ghcliblib}/package.conf.d/*.conf.copy
# https://gitlab.haskell.org/ghc/ghc/-/issues/24121
-rm %{buildroot}%{ghclibdir}/share/doc/%ghcplatform/*/LICENSE
+rm %{buildroot}%{ghclibdir}/share/doc/%{ghcplatform}*/*/LICENSE
(
cd %{buildroot}%{_bindir}
@@ -667,7 +667,7 @@ chmod a-x %{buildroot}%{ghcliblib}/post-link.mjs
%check
export LANG=C.utf8
# stolen from ghc6/debian/rules:
-export LD_LIBRARY_PATH=%{buildroot}%{ghclibplatform}:
+export LD_LIBRARY_PATH=$(echo %{buildroot}%{ghclibplatform}*):
GHC=%{buildroot}%{ghclibdir}/bin/ghc
$GHC --info
# simple sanity checks that the compiler actually works
@@ -873,6 +873,9 @@ make test
%changelog
+* Sat Feb 14 2026 Jens Petersen <petersen@redhat.com> - 9.10.3-13
+- rebuild with ghc-rpm-macros-2.11
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 9.10.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
reply other threads:[~2026-06-09 7:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178098926339.1.10238298480541811054.rpms-ghc9.10-dfacb488a4ab@fedoraproject.org \
--to=petersen@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox