[rpms/fedpkg] 1.48-1: Patch: Clone rawhide branch with clone -B

[rpms/fedpkg] 1.48-1: Patch: Clone rawhide branch with clone -B

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

            A new commit has been pushed.

            Repo   : rpms/fedpkg
            Branch : 1.48-1
            Commit : 7112301bddb0e113e665f757ce39d3a19cf3a5cd
            Author : Ondřej Nosek <onosek@redhat.com>
            Date   : 2021-02-03T15:39:32+00:00
            Stats  : +49/-1 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedpkg/c/7112301bddb0e113e665f757ce39d3a19cf3a5cd?branch=1.48-1

            Log:
            Patch: Clone rawhide branch with clone -B

Signed-off-by: Ondřej Nosek <onosek@redhat.com>

---
diff --git a/0005-Clone-rawhide-branch-with-clone-B.patch b/0005-Clone-rawhide-branch-with-clone-B.patch
new file mode 100644
index 0000000..e3d6d4c
--- /dev/null
+++ b/0005-Clone-rawhide-branch-with-clone-B.patch
@@ -0,0 +1,44 @@
+From 8cf35622253977893035d6303761fbfa92a00435 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
+Date: Wed, 3 Feb 2021 15:01:23 +0100
+Subject: [PATCH] Clone rawhide branch with clone -B
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes: https://pagure.io/fedpkg/issue/427
+Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
+---
+ conf/etc/rpkg/fedpkg-stage.conf | 2 +-
+ conf/etc/rpkg/fedpkg.conf       | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf
+index e81a1d6..bb1901c 100644
+--- a/conf/etc/rpkg/fedpkg-stage.conf
++++ b/conf/etc/rpkg/fedpkg-stage.conf
+@@ -4,7 +4,7 @@ lookasidehash = sha512
+ lookaside_cgi = https://src.stg.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.stg.fedoraproject.org/%(repo)s
+ anongiturl = https://src.stg.fedoraproject.org/%(repo)s.git
+-branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
++branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
+ kojiprofile = stg
+ build_client = koji
+ clone_config_rpms =
+diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf
+index e3089bc..aef75f4 100644
+--- a/conf/etc/rpkg/fedpkg.conf
++++ b/conf/etc/rpkg/fedpkg.conf
+@@ -4,7 +4,7 @@ lookasidehash = sha512
+ lookaside_cgi = https://src.fedoraproject.org/repo/pkgs/upload.cgi
+ gitbaseurl = ssh://%(user)s@pkgs.fedoraproject.org/%(repo)s
+ anongiturl = https://src.fedoraproject.org/%(repo)s.git
+-branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$
++branchre = f\d$|f\d\d$|el\d$|olpc\d$|rawhide$
+ kojiprofile = koji
+ build_client = koji
+ clone_config_rpms =
+-- 
+2.29.2
+

diff --git a/fedpkg.spec b/fedpkg.spec
index dc5125e..c7ecdbe 100644
--- a/fedpkg.spec
+++ b/fedpkg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedpkg
 Version:        1.40
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fedora utility for working with dist-git
 
 License:        GPLv2+
@@ -17,6 +17,7 @@ Patch1:         0001-Do-not-use-pytest-related-dependencies-temporarily.patch
 Patch2:         0002-Fedpkg-update-didn-t-read-bug-numbers-from-changelog.patch
 Patch3:         0003-New-default-dist-git-branch-rawhide.patch
 Patch4:         0004-New-default-dist-git-branch-rawhide-unittests.patch
+Patch5:         0005-Clone-rawhide-branch-with-clone-B.patch
 
 # RHEL7 is currently the only release that is built for Python 2.
 %if 0%{?fedora} || 0%{?rhel} > 7
@@ -146,6 +147,9 @@ mv %{buildroot}%{compdir}/fedpkg.bash %{buildroot}%{compdir}/fedpkg
 
 
 %changelog
+* Wed Feb 03 2021 Ondřej Nosek <onosek@redhat.com> - 1.40-4
+- Patch: Clone rawhide branch with clone -B
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.40-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild