[rpms/rpkg] 1.70-1: Submit DistGit branch name to container-build for OpenShift build conf

[Adam Miller <maxamillion@fedoraproject.org>]

A new commit has been pushed.

Repo   : rpms/rpkg
Branch : 1.70-1
Commit : 9f499af1ac00c0c3905d36ab9b663396ea297136
Author : Adam Miller <maxamillion@fedoraproject.org>
Date   : 2016-11-15T09:54:30-06:00
Stats  : +66/-4 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rpkg/c/9f499af1ac00c0c3905d36ab9b663396ea297136?branch=1.70-1

Log:
Submit DistGit branch name to container-build for OpenShift build conf

---
diff --git a/rpkg-1.46-Pass-DistGit-Branch-container-build.patch b/rpkg-1.46-Pass-DistGit-Branch-container-build.patch
new file mode 100644
index 0000000..3d00b0a
--- /dev/null
+++ b/rpkg-1.46-Pass-DistGit-Branch-container-build.patch
@@ -0,0 +1,56 @@
+From 8e926f0c4967e392f105dcebcfa756e58ad81f93 Mon Sep 17 00:00:00 2001
+From: Vadim Rutkovsky <vrutkovs@redhat.com>
+Date: Sep 21 2016 17:44:35 +0000
+Subject: container-build: use correct parameter for git branch
+
+
+Signed-off-by: Vadim Rutkovsky <vrutkovs@redhat.com>
+
+---
+
+diff --git a/src/pyrpkg/__init__.py b/src/pyrpkg/__init__.py
+index e6105b1..282a59f 100644
+--- a/src/pyrpkg/__init__.py
++++ b/src/pyrpkg/__init__.py
+@@ -2453,7 +2453,8 @@ class Commands(object):
+         git_uri = re.sub(r"^git\+ssh", "git", self.push_url)
+         git_uri = re.sub("^ssh", "git", git_uri)
+         git_uri = re.sub("[^/]+@", "", git_uri)
+-        git_ref = self.branch_merge
++        git_ref = self.commithash
++        git_branch = self.branch_merge
+         user = self.user
+         component = self.module_name
+         docker_target = self.target
+@@ -2465,6 +2466,7 @@ class Commands(object):
+         build = osbs.create_build(
+             git_uri=git_uri,
+             git_ref=git_ref,
++            git_branch=git_branch,
+             user=user,
+             component=component,
+             target=docker_target,
+@@ -2529,7 +2531,7 @@ class Commands(object):
+ 
+             task_opts = {}
+             for key in ('scratch', 'name', 'version', 'release',
+-                        'yum_repourls'):
++                        'yum_repourls', 'git_branch'):
+                 if key in opts:
+                     task_opts[key] = opts[key]
+             priority = opts.get("priority", None)
+diff --git a/src/pyrpkg/cli.py b/src/pyrpkg/cli.py
+index 09dca49..a38b79d 100755
+--- a/src/pyrpkg/cli.py
++++ b/src/pyrpkg/cli.py
+@@ -1084,7 +1084,8 @@ see API KEY section of copr-cli(1) man page.
+ 
+         opts = {"scratch": self.args.scratch,
+                 "quiet": self.args.q,
+-                "yum_repourls": self.args.repo_url}
++                "yum_repourls": self.args.repo_url,
++                "git_branch": self.cmd.branch_merge}
+ 
+         section_name = "%s.container-build" % self.name
+         err_msg = "Missing {option} option in [{plugin.section}] section. "\
+

diff --git a/rpkg.spec b/rpkg.spec
index d859bd7..d8b70a0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -3,13 +3,15 @@
 
 Name:           rpkg
 Version:        1.46
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utility for interacting with rpm+git packaging systems
 
 Group:          Applications/System
 License:        GPLv2+ and LGPLv2
 URL:            https://pagure.io/rpkg
 Source0:        https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz
+# Merged upstream (commit id 8e926f0c4967e392f105dcebcfa756e58ad81f93)
+Patch0:         rpkg-1.46-Pass-DistGit-Branch-container-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       pyrpkg >= %{version}-%{release}
@@ -62,11 +64,11 @@ A python library for managing RPM package sources in a git repository.
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-%{__python} doc/rpkg_man_page.py > rpkg.1
+%{__python} src/rpkg_man_page.py > rpkg.1
 
 
 %install
@@ -77,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %check
 %{__python} setup.py test
- 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 11 2016 Adam Miller <maxamillion@fedoraproject.org> - 1.46-6
+- Submit DistGit branch name to container-build for OpenShift build conf,
+  upstream commit id 8e926f0c4967e392f105dcebcfa756e58ad81f93
+
 * Tue Oct 25 2016 Lubomír Sedlář <lsedlar@redhat.com> - 1.46-5
 - Allow using gssapi for lookaside caches