commit 051ad3daa85ae6f445a0b0762ae8f36c292c2996 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Sep 6 16:58:50 2022 +0100 Disable multilibs builds on el8, 9 and 9-next ...able-multilibs-builds-on-el8-9-and-9-next.patch | 27 ++++++++++++++++++++++ rfpkg.spec | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) --- diff --git a/0001-disable-multilibs-builds-on-el8-9-and-9-next.patch b/0001-disable-multilibs-builds-on-el8-9-and-9-next.patch new file mode 100644 index 0000000..50ab980 --- /dev/null +++ b/0001-disable-multilibs-builds-on-el8-9-and-9-next.patch @@ -0,0 +1,27 @@ +From 0370cf8a24e90382dcb7164188df95e263efed99 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio(a)serjux.com&gt; +Date: Mon, 5 Sep 2022 23:23:25 +0100 +Subject: [PATCH] disable multilibs builds on el8, 9 and 9-next + +--- + rfpkg/__init__.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rfpkg/__init__.py b/rfpkg/__init__.py +index ada3868..75b4e9f 100644 +--- a/rfpkg/__init__.py ++++ b/rfpkg/__init__.py +@@ -190,8 +190,8 @@ class Commands(pyrpkg.Commands): + 'opencore-amr', 'rtmpdump', 'vo-amrwbenc', 'x264', 'x265', 'xvidcore', 'zsnes', + 'Cg', 'dega-sdl', 'gens', 'pcsx2', 'steam', 'xorg-x11-drv-nvidia', + 'xorg-x11-drv-nvidia-470xx', 'xorg-x11-drv-nvidia-390xx', +- 'xorg-x11-drv-nvidia-340xx', 'unace'] and self.branch_merge not in ['el6', 'f28', +- 'f29', 'f30'] and self.namespace in ['free', 'nonfree']: ++ 'xorg-x11-drv-nvidia-340xx', 'unace'] and self.branch_merge not in ['el8', 'el9', ++ 'el9-next'] and self.namespace in ['free', 'nonfree']: + self._target += "-multilibs" + + def _tag2version(self, dest_tag): +-- +2.37.2 + diff --git a/rfpkg.spec b/rfpkg.spec index d8aeba7..e4bfb25 100644 --- a/rfpkg.spec +++ b/rfpkg.spec @@ -5,7 +5,7 @@ Name: rfpkg Version: 1.27.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: RPM Fusion utility for working with dist-git License: GPLv2+ Group: Applications/System @@ -17,6 +17,7 @@ Patch3: 0003-Fix-the-download-of-old-sources-with-md5-hash.patch # Removing duplicate retire parser because of incompatibility with Python 3.11 # See https://github.com/rpmfusion-infra/rfpkg/pull/25 Patch4: 0001-Remove-register_retire-from-rfpkg.patch +Patch5: 0001-disable-multilibs-builds-on-el8-9-and-9-next.patch BuildArch: noarch @@ -151,6 +152,9 @@ nosetests %changelog +* Tue Sep 06 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.27.0-6 +- Disable multilibs builds on el8, 9 and 9-next + * Sat Jun 25 2022 Robert-André Mauchin <zebob.m(a)gmail.com&gt; - 1.27.0-5 - Rebuilt for Python 3.11