[rfpkg] update target of 2 packages

commit 295f70d680f7421aec0b8fe143191566043de849 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Feb 12 01:59:15 2022 +0000 update target of 2 packages ...dd-xorg-x11-drv-nvidia-470xx-to-multilibs.patch | 26 ++++++++++++++++++++++ ...e-to-multilibs-because-is-an-i686-package.patch | 25 +++++++++++++++++++++ rfpkg.spec | 7 +++++- 3 files changed, 57 insertions(+), 1 deletion(-) --- diff --git a/0001-Add-xorg-x11-drv-nvidia-470xx-to-multilibs.patch b/0001-Add-xorg-x11-drv-nvidia-470xx-to-multilibs.patch new file mode 100644 index 0000000..7ac9155 --- /dev/null +++ b/0001-Add-xorg-x11-drv-nvidia-470xx-to-multilibs.patch @@ -0,0 +1,26 @@ +From aff0a841d6e3237304326685fa2dea0054b0dba9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio(a)serjux.com&gt; +Date: Sun, 31 Oct 2021 11:39:48 +0000 +Subject: [PATCH 1/2] Add xorg-x11-drv-nvidia-470xx to multilibs + +--- + rfpkg/__init__.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/rfpkg/__init__.py b/rfpkg/__init__.py +index 43b535d..30ac68c 100644 +--- a/rfpkg/__init__.py ++++ b/rfpkg/__init__.py +@@ -188,7 +188,8 @@ class Commands(pyrpkg.Commands): + 'gstreamer1-plugins-bad-freeworld', 'gstreamer1-plugins-ugly', 'faad2', 'ffmpeg', + 'libde265', 'libdca', 'libmms', 'libquicktime', 'libva-intel-driver', 'mjpegtools', + 'opencore-amr', 'rtmpdump', 'vo-amrwbenc', 'x264', 'x265', 'xvidcore', 'zsnes', +- 'Cg', 'dega-sdl', 'gens', 'pcsx2', 'steam', 'xorg-x11-drv-nvidia', 'xorg-x11-drv-nvidia-390xx', ++ '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'] and self.branch_merge not in ['el6', 'f28', + 'f29', 'f30'] and self.namespace in ['free', 'nonfree']: + self._target += "-multilibs" +-- +2.34.1 + diff --git a/0002-Add-unace-to-multilibs-because-is-an-i686-package.patch b/0002-Add-unace-to-multilibs-because-is-an-i686-package.patch new file mode 100644 index 0000000..509fa63 --- /dev/null +++ b/0002-Add-unace-to-multilibs-because-is-an-i686-package.patch @@ -0,0 +1,25 @@ +From 11f2c566d4513eac1303a4a38eff3418b442739e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio(a)serjux.com&gt; +Date: Fri, 11 Feb 2022 23:20:56 +0000 +Subject: [PATCH 2/2] Add unace to multilibs because is an i686 package + +--- + rfpkg/__init__.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rfpkg/__init__.py b/rfpkg/__init__.py +index 30ac68c..d376d44 100644 +--- a/rfpkg/__init__.py ++++ b/rfpkg/__init__.py +@@ -190,7 +190,7 @@ 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'] and self.branch_merge not in ['el6', 'f28', ++ 'xorg-x11-drv-nvidia-340xx', 'unace'] and self.branch_merge not in ['el6', 'f28', + 'f29', 'f30'] and self.namespace in ['free', 'nonfree']: + self._target += "-multilibs" + +-- +2.34.1 + diff --git a/rfpkg.spec b/rfpkg.spec index d236e7d..c592019 100644 --- a/rfpkg.spec +++ b/rfpkg.spec @@ -5,12 +5,14 @@ Name: rfpkg Version: 1.27.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM Fusion utility for working with dist-git License: GPLv2+ Group: Applications/System URL: https://github.com/rpmfusion-infra/rfpkg Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-Add-xorg-x11-drv-nvidia-470xx-to-multilibs.patch +Patch2: 0002-Add-unace-to-multilibs-because-is-an-i686-package.patch BuildArch: noarch @@ -139,6 +141,9 @@ nosetests %changelog +* Sat Feb 12 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 1.27.0-2 +- update target of 2 packages + * Sat Oct 23 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 1.27.0-1 - Update to 1.27.0