qulogic pushed to rpms/python-cartopy (rawhide). "Backport fix for
Matplotlib 3.7"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:31:02 UTC
From de2e44cdf6283c66ddbce1258c959ec582862094 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Mar 01 2023 01:30:45 +0000
Subject: Backport fix for Matplotlib 3.7
---
diff --git a/6b4572ba1a8a877f28e25dfe9559c14b7a565958.patch b/6b4572ba1a8a877f28e25dfe9559c14b7a565958.patch
new file mode 100644
index 0000000..53256ab
--- /dev/null
+++ b/6b4572ba1a8a877f28e25dfe9559c14b7a565958.patch
@@ -0,0 +1,36 @@
+From 6b4572ba1a8a877f28e25dfe9559c14b7a565958 Mon Sep 17 00:00:00 2001
+From: Greg Lucas <greg.m.lucas(a)gmail.com>
+Date: Thu, 26 Jan 2023 08:51:54 -0700
+Subject: [PATCH] TST/FIX: Test for instance rather than string in class
+ representation
+
+Matplotlib has merged SubplotBase into AxesBase now, which makes the
+class string representation here GeoAxes now, even though we are
+still an _instance_ of GeoAxesSubplot
+---
+ lib/cartopy/tests/mpl/test_axes.py | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/cartopy/tests/mpl/test_axes.py b/lib/cartopy/tests/mpl/test_axes.py
+index eaf5904b0..d4e37a113 100644
+--- a/lib/cartopy/tests/mpl/test_axes.py
++++ b/lib/cartopy/tests/mpl/test_axes.py
+@@ -13,7 +13,8 @@
+
+ import cartopy.crs as ccrs
+ import cartopy.feature as cfeature
+-from cartopy.mpl.geoaxes import InterProjectionTransform, GeoAxes
++from cartopy.mpl.geoaxes import (
++ InterProjectionTransform, GeoAxes, GeoAxesSubplot)
+
+
+ class TestNoSpherical:
+@@ -119,7 +120,7 @@ def test_single_geometry(self):
+
+ def test_geoaxes_subplot():
+ ax = plt.subplot(1, 1, 1, projection=ccrs.PlateCarree())
+- assert str(ax.__class__) == "<class 'cartopy.mpl.geoaxes.GeoAxesSubplot'>"
++ assert isinstance(ax, GeoAxesSubplot)
+
+
+ @pytest.mark.mpl_image_compare(filename='geoaxes_subslice.png')
diff --git a/python-cartopy.spec b/python-cartopy.spec
index df04fee..31257b5 100644
--- a/python-cartopy.spec
+++ b/python-cartopy.spec
@@ -22,6 +22,8 @@ Patch0002: 0002-Use-pkg-config-to-find-GEOS-instead-of-geos-config.patch
Patch0003: 0003-Remove-extraneous-insertion-of-default-compiler-path.patch
# We don't need to worry about the bugs with setuptools-scm < 7.
Patch0004: 0004-Allow-older-setuptools-scm.patch
+# Fix build with Matplotlib 3.7
+Patch0005: https://github.com/SciTools/cartopy/commit/6b4572ba1a8a877f28e25dfe9559c1...
BuildRequires: gcc-c++
BuildRequires: geos-devel >= 3.7.2
https://src.fedoraproject.org/rpms/python-cartopy/c/de2e44cdf6283c66ddbce...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (epel9). "Require a bumped rpkg version
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:27:00 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (epel8). "Require a bumped rpkg version
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:26:57 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (epel7). "Require a bumped rpkg version
(..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:26:54 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (f38). "Require a bumped rpkg version (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:26:51 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (f37). "Require a bumped rpkg version (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:26:48 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (f36). "Require a bumped rpkg version (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:26:45 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
onosek pushed to rpms/fedpkg (rawhide). "Require a bumped rpkg
version (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:26:43 UTC
From 2eb684372c13b508a12f97cd98d715b201f0f571 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 01:24:53 +0000
Subject: Require a bumped rpkg version
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/fedpkg.spec b/fedpkg.spec
index cb1c7eb..ef85c6b 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
Name: fedpkg
Version: 1.44
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Fedora utility for working with dist-git
License: GPLv2+
@@ -39,7 +39,7 @@ Requires: redhat-rpm-config
BuildRequires: python2-devel
# We br these things for man page generation due to imports
-BuildRequires: python2-rpkg >= 1.66-2
+BuildRequires: python2-rpkg >= 1.66-3
BuildRequires: python2-distro
BuildRequires: python2-fedora
# For testing
@@ -53,7 +53,7 @@ BuildRequires: python-bugzilla
Requires: bodhi-client >= 2.0
Requires: python-bugzilla
-Requires: python2-rpkg >= 1.66-2
+Requires: python2-rpkg >= 1.66-3
Requires: python2-distro
Requires: python2-fedora
Requires: python2-openidc-client >= 0.6.0
@@ -65,7 +65,7 @@ Requires: fedora-packager
%global __python %{__python3}
BuildRequires: python3-devel
-BuildRequires: python3-rpkg >= 1.66-2
+BuildRequires: python3-rpkg >= 1.66-3
BuildRequires: python3-distro
BuildRequires: python3-fedora
# For testing
@@ -77,7 +77,7 @@ BuildRequires: python3-bodhi-client
Requires: python3-bugzilla
-Requires: python3-rpkg >= 1.66-2
+Requires: python3-rpkg >= 1.66-3
Requires: python3-distro
Requires: python3-fedora
Requires: python3-openidc-client >= 0.6.0
@@ -147,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-2
+- Require a bumped rpkg version
+
* Mon Feb 20 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.44-1
- Do not execute unittests for old bodhi-client (onosek)
- New command `disable-monitoring` (onosek)
https://src.fedoraproject.org/rpms/fedpkg/c/2eb684372c13b508a12f97cd98d71...
1Â year, 2Â months
pagure pushed to rpms/redhat-rpm-config (rawhide). "Include
RUSTFLAGS in %set_build_flags (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:08:00 UTC
From 9fb7ec9c17a951cb63739036630f8f2d4db699a2 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell(a)gtmx.me>
Date: Feb 28 2023 23:31:25 +0000
Subject: Include RUSTFLAGS in %set_build_flags
Resolves: https://bugzilla.redhat.com/2167183
---
diff --git a/macros b/macros
index b9dccf1..c69ba73 100644
--- a/macros
+++ b/macros
@@ -86,12 +86,15 @@
# have not been set already. RPM_OPT_FLAGS and RPM_LD_FLAGS have already
# been set implicitly at the start of the %%build section.
# LT_SYS_LIBRARY_PATH is used by libtool script.
+# RUSTFLAGS is only set when rust-packaging which defines %%{build_rustflags} is
+# available.
%set_build_flags \
CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%{build_fflags}}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \
- VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ; \
+ VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ;%{?build_rustflags:
+ RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ;} \
LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS ; \
LT_SYS_LIBRARY_PATH="${LT_SYS_LIBRARY_PATH:-%_libdir:}" ; export LT_SYS_LIBRARY_PATH ; \
CC="${CC:-%{__cc}}" ; export CC ; \
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 3dc603b..ffb1e04 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -4,7 +4,7 @@
# 2) When making changes, increment the version (in baserelease) by 1.
# rpmdev-bumpspec and other tools update the macro below, which is used
# in Version: to get the desired effect.
-%global baserelease 252
+%global baserelease 253
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
@@ -252,6 +252,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%doc buildflags.md
%changelog
+* Tue Feb 28 2023 Maxwell G <gotmax(a)e.email> - 253-1
+- Include RUSTFLAGS in %%set_build_flags
+- Fixes: rhbz#2167183
+
* Tue Feb 28 2023 Tom Stellard <tstellar(a)redhat.com> - 252-1
- Rename _pkg_extra_* macros to _distro_extra_*
https://src.fedoraproject.org/rpms/redhat-rpm-config/c/9fb7ec9c17a951cb63...
1Â year, 2Â months