rpms/redhat-rpm-config
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Don't pull in qt5-srpm-macros on RHEL 10

Browse Source
This commit is contained in:
Jan Grulich 2023-11-03 14:12:40 +01:00
parent 19a840bac0
commit a15ac4695e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redhat-rpm-config.spec
View File

@ -4,7 +4,7 @@
# 2) When making changes, increment the version (in baserelease) by 1. # 2) When making changes, increment the version (in baserelease) by 1.
# rpmdev-bumpspec and other tools update the macro below, which is used # rpmdev-bumpspec and other tools update the macro below, which is used
# in Version: to get the desired effect. # in Version: to get the desired effect.
%global baserelease 275 %global baserelease 276
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
@ -103,7 +103,9 @@ Requires: openblas-srpm-macros
Requires: perl-srpm-macros Requires: perl-srpm-macros
# ↓ Has Python BRPs originaly present in redhat-rpm-config # ↓ Has Python BRPs originaly present in redhat-rpm-config
Requires: python-srpm-macros >= 3.11-7 Requires: python-srpm-macros >= 3.11-7
%if ! 0%{?rhel}
Requires: qt5-srpm-macros Requires: qt5-srpm-macros
%endif
Requires: qt6-srpm-macros Requires: qt6-srpm-macros
# rust-srpm-macros v24 contains %%build_rustflags defintion # rust-srpm-macros v24 contains %%build_rustflags defintion
Requires: rust-srpm-macros >= 24 Requires: rust-srpm-macros >= 24
@ -256,6 +258,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua
%doc buildflags.md %doc buildflags.md
%changelog %changelog
* Thu Jan 11 2024 Jan Grulich <jgrulich@redhat.com> - 276-1
- Drop qt5-srpm-macros from RHEL 10
* Fri Jan 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 275-1 * Fri Jan 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 275-1
- Define RUSTFLAGS only when rust macros are installed - Define RUSTFLAGS only when rust macros are installed