[rpms/fedpkg] 1.48-1: Disable tag inheritance check

[rpms/fedpkg] 1.48-1: Disable tag inheritance check

[@ 2026-08-10 21:45 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : a5b266058564b83c26f1d7689bbcc79f4babcb01
            Author : Lubomír Sedlář <lsedlar@redhat.com>
            Date   : 2017-02-01T08:32:21+01:00
            Stats  : +57/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/a5b266058564b83c26f1d7689bbcc79f4babcb01?branch=1.48-1

            Log:
            Disable tag inheritance check

This should fix chain-build for rawhide. The patch is backported from
git and should be dropped for next upstream release.

---
diff --git a/0001-Disable-tag-inheritance-check.patch b/0001-Disable-tag-inheritance-check.patch
new file mode 100644
index 0000000..2864514
--- /dev/null
+++ b/0001-Disable-tag-inheritance-check.patch
@@ -0,0 +1,50 @@
+From c776c303cb86a1f9bf912c74d4abc56b6a044a78 Mon Sep 17 00:00:00 2001
+From: Chenxiong Qi <cqi@redhat.com>
+Date: Wed, 11 Jan 2017 22:46:05 +0800
+Subject: [PATCH] Disable tag inheritance check
+
+Fixes: #98
+
+Signed-off-by: Chenxiong Qi <cqi@redhat.com>
+---
+ CHANGELOG.rst      | 5 +++++
+ fedpkg/__init__.py | 7 +++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/CHANGELOG.rst b/CHANGELOG.rst
+index 771af16..e296d72 100644
+--- a/CHANGELOG.rst
++++ b/CHANGELOG.rst
+@@ -1,6 +1,11 @@
+ ChangeLog
+ =========
+ 
++NEXT
++----
++
++- Disable tag inheritance check - #98 (cqi)
++
+ v1.26 (2016-12-15)
+ ------------------
+ 
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index 1b12abe..0345c7c 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -268,6 +268,13 @@ class Commands(pyrpkg.Commands):
+         # fall through, return None
+         return None
+ 
++    def check_inheritance(self, build_target, dest_tag):
++        """Disable check inheritance
++
++        Tag inheritance check is not required in Fedora when make chain build
++        in Koji.
++        """
++
+     def retire(self, message):
+         """Delete all tracked files and commit a new dead.package file
+ 
+-- 
+2.9.3
+

diff --git a/fedpkg.spec b/fedpkg.spec
index bb73b19..73d26bb 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -8,7 +8,7 @@
 
 Name:           fedpkg
 Version:        1.26
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
@@ -16,6 +16,8 @@ License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
 Patch0:         0001-Disable-anongiturl-over-https.patch
+# Backported from git, drop for next upstream release
+Patch1:         0001-Disable-tag-inheritance-check.patch
 
 Requires:       redhat-rpm-config
 Requires:       pyrpkg >= 1.47
@@ -51,6 +53,7 @@ Provides the fedpkg command for working with dist-git
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -94,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Feb 01 2017 Lubomír Sedlář <lsedlar@redhat.com> - 1.26-5
+- Disable tag inheritance check
+
 * Thu Dec 15 2016 Chenxiong Qi <cqi@redhat.com> - 1.26-4
 - Fix handle unicode chars in git log - BZ#1404724 (cqi)
 - Fix: make fedpkg workable with bodhi 2 CLI - #87 (cqi)