Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ghc-srpm-macros: Upgrade to 1.9.2-1 #10788

Open
wants to merge 4 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"macros.ghc-srpm": "8f48e4897e0cd06ebeef5ea3738c1dec8d72e56c11a268715bda2395848aeb9c"
"macros.ghc-srpm": "0c3c73b570dd7df6f815dc8a099bb7a0921604d737644c9f49c179ae48ef33b7"
}
}
71 changes: 62 additions & 9 deletions SPECS-EXTENDED/ghc-srpm-macros/ghc-srpm-macros.spec
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Vendor: Microsoft Corporation
Distribution: Azure Linux
# ghc has been bootstrapped on all Fedora archs except aarch64.
# The ghc interpreter ghci is only supported on a subset of archs.

%global macros_dir %{_rpmconfigdir}/macros.d

%global macrosfile macros.ghc-srpm

Name: ghc-srpm-macros
Version: 1.5.0
Version: 1.9.1
Release: 3%{?dist}
Summary: RPM macros for building Haskell source packages

License: GPLv2+
License: GPL-2.0-or-later
Url: https://src.fedoraproject.org/rpms/ghc-srpm-macros
BuildArch: noarch

Source0: macros.ghc-srpm
Source0: %{macrosfile}

%description
Macros used when generating Haskell source RPM packages.
Expand All @@ -29,16 +29,69 @@ echo no build stage needed


%install
install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/macros.ghc-srpm
install -p -D -m 0644 %{SOURCE0} %{buildroot}/%{macros_dir}/%{macrosfile}


%files
%{macros_dir}/macros.ghc-srpm
%{macros_dir}/%{macrosfile}


%changelog
* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 1.5.0-3
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
* Tue Jan 07 2025 Durga Jagadeesh Palli <[email protected]> - 1.9.1-3
- Initial Azure Linux import from Fedora 41 (license: MIT)
- License verified

* Mon Mar 18 2024 Jens Petersen <[email protected]> - 1.9.1-1
- %%haskell_setup -q replaces %%haskell_setup_quick
- %%haskell_setup -p and -h options disable prof and doc

* Thu Mar 7 2024 Jens Petersen <[email protected]> - 1.9-1
- improve haskell_setup to undefine the old macros
- add haskell_setup_quick for test builds

* Wed Mar 06 2024 David Abdurachmanov <[email protected]> - 1.8-1
- Add riscv64

* Thu Feb 29 2024 Jens Petersen <[email protected]> - 1.7-1
- add ghc_profiling and haskell_setup macros: will replace with_ghc_prof

* Wed Jan 24 2024 Fedora Release Engineering <[email protected]> - 1.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Fri Jan 19 2024 Fedora Release Engineering <[email protected]> - 1.6.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

* Thu Sep 21 2023 Jens Petersen <[email protected]> - 1.6.1-3
- migrate to SPDX license tag

* Wed Jul 19 2023 Fedora Release Engineering <[email protected]> - 1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

* Mon Jan 30 2023 Jens Petersen <[email protected]> - 1.6.1-1
- restore ghc_devel_prof for existing ghc spec files

* Sat Jan 21 2023 Jens Petersen <[email protected]> - 1.6.0-1
- drop long unused ghc_arches_with_ghci
- update (unused) ghc_arches
- replace unused ghc_devel_prof with with_ghc_prof (moved from ghc-rpm-macros)

* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1.5.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

* Thu Jul 21 2022 Fedora Release Engineering <[email protected]> - 1.5.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1.5.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 1.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 1.5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

* Mon Jul 27 2020 Fedora Release Engineering <[email protected]> - 1.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

* Tue Jan 28 2020 Fedora Release Engineering <[email protected]> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Expand Down
35 changes: 25 additions & 10 deletions SPECS-EXTENDED/ghc-srpm-macros/macros.ghc-srpm
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
# Macros needed for building srpms of Haskell packages
# Macros needed for building srpms of Haskell packages -*-rpm-spec-*-

# from ghc-7.8 ghci is supported on all arch's
# former archs: armv5tel ppc sparcv9
%ghc_arches_with_ghci %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x %{mips}
# ghc_arches is not used in any current packages
# former archs: alpha ppc ppc64 sparcv9 armv5tel armv7hl
%ghc_arches %{ix86} x86_64 ppc64le aarch64 s390x riscv64

# ghc_arches is not used in current packages but still here for back compat
# former archs: alpha ppc sparcv9 armv5tel
%ghc_arches %{ix86} x86_64 armv7hl ppc64 ppc64le aarch64 s390 s390x

# control whether to BR devel or prof library packages
# (prof subpackages were introduced in F31)
# deprecated - kept for ghc.spec back compatibility
%ghc_devel_prof prof

# enable profiling libraries in prof subpkgs (deprecated)
%with_ghc_prof 1

%ghc_profiling\
%bcond ghc_prof 1

# -q for quick build
# -p for no prof
# -h for no haddock
%haskell_setup(qph)\
%{-q:%{warn:**'%0 -q' should not be used in official builds**}}\
%if %{defined ghc_profiling}\
%undefine with_ghc_prof\
%{!-q:%{!-p:%ghc_profiling}}\
%endif\
%if %{defined ghc_haddocks}\
%undefine with_haddock\
%{!-q:%{!-h:%ghc_haddocks}}\
%endif
10 changes: 10 additions & 0 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4295,6 +4295,16 @@
}
}
},
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not look like a right entry to have since the Source is not a URL but a macro pointing to a file already bundled.

"component": {
"type": "other",
"other": {
"name": "ghc-srpm-macros",
"version": "1.9.1",
"downloadUrl": "https://src.fedoraproject.org/rpms/ghc-srpm-macros"
}
}
},
{
"component": {
"type": "other",
Expand Down