commit 6cf8868d25e3760eea3484c170f971b758a269ba Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Fri Sep 9 09:46:05 2022 +0100 Fix for rpkg-1.65 change fix_for_rpkg_change.patch | 37 +++++++++++++++++++++++++++++++++++++ rfpkg.spec | 6 +++++- 2 files changed, 42 insertions(+), 1 deletion(-) --- diff --git a/fix_for_rpkg_change.patch b/fix_for_rpkg_change.patch new file mode 100644 index 0000000..86c4c1c --- /dev/null +++ b/fix_for_rpkg_change.patch @@ -0,0 +1,37 @@ +diff -uNrp a/rfpkg/__init__.py b/rfpkg/__init__.py +--- a/rfpkg/__init__.py 2021-10-23 05:52:51.000000000 +0100 ++++ b/rfpkg/__init__.py 2022-09-09 09:42:04.837792272 +0100 +@@ -158,22 +158,22 @@ class Commands(pyrpkg.Commands): + raise pyrpkg.rpkgError('Could not find the release/dist from branch name ' + '%s\nPlease specify with --release' % + self.branch_merge) +- self._rpmdefines = ["--define '_sourcedir %s'" % self.path, +- "--define '_specdir %s'" % self.path, +- "--define '_builddir %s'" % self.path, +- "--define '_srcrpmdir %s'" % self.path, +- "--define '_rpmdir %s'" % self.path, +- "--define 'dist .%s'" % self._disttag, +- "--define '%s %s'" % (self._distvar, ++ self._rpmdefines = ["--define", "_sourcedir %s" % self.path, ++ "--define", "_specdir %s" % self.path, ++ "--define", "_builddir %s" % self.path, ++ "--define", "_srcrpmdir %s" % self.path, ++ "--define", "_rpmdir %s" % self.path, ++ "--define", "dist .%s" % self._disttag, ++ "--define", "%s %s" % (self._distvar, + self._distval), +- "--eval '%%undefine %s'" % self._distunset, +- "--define '%s 1'" % self._disttag] ++ "--eval", "%%undefine %s" % self._distunset, ++ "--define", "%s 1'" % self._disttag] + if self._runtime_disttag: + if self._disttag != self._runtime_disttag: + # This means that the runtime is known, and is different from + # the target, so we need to unset the _runtime_disttag +- self._rpmdefines.append("--eval '%%undefine %s'" % +- self._runtime_disttag) ++ self._rpmdefines.extend(["--eval", "%%undefine %s" % ++ self._runtime_disttag]) + + def load_target(self): + """This creates the target attribute based on branch merge""" diff --git a/rfpkg.spec b/rfpkg.spec index e4bfb25..a70d482 100644 --- a/rfpkg.spec +++ b/rfpkg.spec @@ -5,7 +5,7 @@ Name: rfpkg Version: 1.27.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RPM Fusion utility for working with dist-git License: GPLv2+ Group: Applications/System @@ -18,6 +18,7 @@ Patch3: 0003-Fix-the-download-of-old-sources-with-md5-hash.patch # 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 +Patch6: fix_for_rpkg_change.patch BuildArch: noarch @@ -152,6 +153,9 @@ nosetests %changelog +* Fri Sep 09 2022 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.27.0-7 +- Fix for rpkg-1.65 change + * 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