[rpms/fedpkg] 1.48-1: Use correct build target for containers

[rpms/fedpkg] 1.48-1: Use correct build target for containers

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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 152b77a8decbbb4232009fff128126f680dfaef4
            Author : Lubomír Sedlář <lsedlar@redhat.com>
            Date   : 2017-09-15T08:18:48+02:00
            Stats  : +74/-1 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/152b77a8decbbb4232009fff128126f680dfaef4?branch=1.48-1

            Log:
            Use correct build target for containers

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>

---
diff --git a/0001-Get-correct-build-target-for-rawhide-containers.patch b/0001-Get-correct-build-target-for-rawhide-containers.patch
new file mode 100644
index 0000000..0d6c454
--- /dev/null
+++ b/0001-Get-correct-build-target-for-rawhide-containers.patch
@@ -0,0 +1,35 @@
+From 204b1a464a0cea4b42c3b1ab7a6b001521142cb0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Tue, 12 Sep 2017 16:07:29 +0200
+Subject: [PATCH 1/2] Get correct build target for rawhide containers
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The target is named `rawhide-`, not `master-`.
+
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ fedpkg/__init__.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index 4b6a5a2..92d9145 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -132,6 +132,12 @@ class Commands(pyrpkg.Commands):
+         else:
+             self._target = '%s-candidate' % self.branch_merge
+ 
++    def load_container_build_target(self):
++        if self.branch_merge == 'master':
++            self._target = 'rawhide-%s-candidate' % self.ns
++        else:
++            super(Commands, self).load_container_build_target()
++
+     def load_user(self):
+         """This sets the user attribute, based on the Fedora SSL cert."""
+         try:
+-- 
+2.13.5
+

diff --git a/0002-Fix-container-build-target.patch b/0002-Fix-container-build-target.patch
new file mode 100644
index 0000000..b630f46
--- /dev/null
+++ b/0002-Fix-container-build-target.patch
@@ -0,0 +1,31 @@
+From 6cfbc82c3b44e39ec81bd019cb3b6fa452630028 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Wed, 13 Sep 2017 09:06:49 +0200
+Subject: [PATCH 2/2] Fix container build target
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The value needs to be assigned to correct attribute, really...
+
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ fedpkg/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
+index 92d9145..420eebe 100644
+--- a/fedpkg/__init__.py
++++ b/fedpkg/__init__.py
+@@ -134,7 +134,7 @@ class Commands(pyrpkg.Commands):
+ 
+     def load_container_build_target(self):
+         if self.branch_merge == 'master':
+-            self._target = 'rawhide-%s-candidate' % self.ns
++            self._container_build_target = 'rawhide-%s-candidate' % self.ns
+         else:
+             super(Commands, self).load_container_build_target()
+ 
+-- 
+2.13.5
+

diff --git a/fedpkg.spec b/fedpkg.spec
index 2602855..c553a3c 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -8,13 +8,15 @@
 
 Name:           fedpkg
 Version:        1.29
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            https://pagure.io/fedpkg
 Source0:        https://pagure.io/releases/fedpkg/%{name}-%{version}.tar.bz2
+Patch0:         0001-Get-correct-build-target-for-rawhide-containers.patch
+Patch1:         0002-Fix-container-build-target.patch
 
 BuildArch:      noarch
 
@@ -55,6 +57,8 @@ Provides the fedpkg command for working with dist-git
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -98,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep 15 2017 Lubomír Sedlář <lsedlar@redhat.com> - 1.29-5
+- Use correct build target for containers
+
 * Mon Sep 04 2017 Chenxiong Qi <cqi@redhat.com> - 1.29-4
 - Fix fedpkg N-V-R dependency in fedpkg-stage subpackage