public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rpkg] 1.70-1: New release 1.51-3
@ 2026-08-10 21:43 Chenxiong Qi
0 siblings, 0 replies; only message in thread
From: Chenxiong Qi @ 2026-08-10 21:43 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/rpkg
Branch : 1.70-1
Commit : dd1d7093a3bfffaa488d1603d7310b4376a9630b
Author : Chenxiong Qi <cqi@redhat.com>
Date : 2018-01-23T09:52:55+08:00
Stats : +124/-1 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/rpkg/c/dd1d7093a3bfffaa488d1603d7310b4376a9630b?branch=1.70-1
Log:
New release 1.51-3
Signed-off-by: Chenxiong Qi <cqi@redhat.com>
---
diff --git a/0001-Add-compose-id-and-signing-intent-arguments.patch b/0001-Add-compose-id-and-signing-intent-arguments.patch
new file mode 100644
index 0000000..3d0ef0f
--- /dev/null
+++ b/0001-Add-compose-id-and-signing-intent-arguments.patch
@@ -0,0 +1,90 @@
+From 00a8c40153b276a63088b7891f866f62161d6f5c Mon Sep 17 00:00:00 2001
+From: Bret Fontecchio <bfontecc@redhat.com>
+Date: Thu, 30 Nov 2017 15:30:00 -0500
+Subject: [PATCH] Add compose-id and signing-intent arguments
+
+Signed-off-by: Bret Fontecchio <bfontecc@redhat.com>
+---
+ pyrpkg/cli.py | 27 +++++++++++++++++++++------
+ tests/test_cli.py | 6 ++++++
+ 2 files changed, 27 insertions(+), 6 deletions(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index c8ce3d7..7799d29 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1026,11 +1026,24 @@ see API KEY section of copr-cli(1) man page.
+ help='Build a container',
+ description='Build a container')
+
+- self.container_build_parser.add_argument(
+- '--repo-url',
+- metavar="URL",
+- help=('URL of yum repo file'),
+- nargs='*')
++ group = self.container_build_parser.add_mutually_exclusive_group()
++ group.add_argument(
++ '--compose-id',
++ dest='compose_ids',
++ metavar='COMPOSE_ID',
++ help='ODCS composes used. '
++ 'Cannot be used with --signing-intent or --repo-url',
++ nargs='*')
++ group.add_argument(
++ '--signing-intent',
++ help='Signing intent of the ODCS composes. Cannot be '
++ 'used with --compose-id or --repo-url')
++ group.add_argument(
++ '--repo-url',
++ metavar="URL",
++ help='URL of yum repo file'
++ 'Cannot be used with --signing-intent or --compose-id',
++ nargs='*')
+
+ self.container_build_parser.add_argument(
+ '--target',
+@@ -1280,7 +1293,9 @@ see API KEY section of copr-cli(1) man page.
+ "quiet": self.args.q,
+ "yum_repourls": self.args.repo_url,
+ "git_branch": self.cmd.branch_merge,
+- "arches": self.args.arches}
++ "arches": self.args.arches,
++ "compose_ids": self.args.compose_ids,
++ "signing_intent": self.args.signing_intent}
+
+ section_name = "%s.container-build" % self.name
+ err_msg = "Missing %(option)s option in [%(plugin.section)s] section. " \
+diff --git a/tests/test_cli.py b/tests/test_cli.py
+index 11b9bc8..2ba93ea 100644
+--- a/tests/test_cli.py
++++ b/tests/test_cli.py
+@@ -205,6 +205,8 @@ class TestContainerBuildWithKoji(CliTestCase):
+ 'yum_repourls': None,
+ 'git_branch': 'eng-rhel-7',
+ 'arches': None,
++ 'signing_intent': None,
++ 'compose_ids': None
+ },
+ kojiconfig=None,
+ kojiprofile='koji',
+@@ -230,6 +232,8 @@ class TestContainerBuildWithKoji(CliTestCase):
+ 'yum_repourls': None,
+ 'git_branch': 'eng-rhel-7',
+ 'arches': None,
++ 'signing_intent': None,
++ 'compose_ids': None
+ },
+ kojiconfig=None,
+ kojiprofile='koji',
+@@ -264,6 +268,8 @@ class TestContainerBuildWithKoji(CliTestCase):
+ 'yum_repourls': None,
+ 'git_branch': 'eng-rhel-7',
+ 'arches': None,
++ 'signing_intent': None,
++ 'compose_ids': None
+ },
+ kojiconfig='/path/to/koji.conf',
+ kojiprofile=None,
+--
+2.14.3
+
diff --git a/0001-Change-type-of-compose-id-from-string-to-int.patch b/0001-Change-type-of-compose-id-from-string-to-int.patch
new file mode 100644
index 0000000..7575e65
--- /dev/null
+++ b/0001-Change-type-of-compose-id-from-string-to-int.patch
@@ -0,0 +1,25 @@
+From cbd8e35111b90074e690f46b82fadd8ab51abcf9 Mon Sep 17 00:00:00 2001
+From: Bret Fontecchio <bfontecc@redhat.com>
+Date: Mon, 11 Dec 2017 13:01:57 -0500
+Subject: [PATCH] Change type of compose id from string to int
+
+Signed-off-by: Bret Fontecchio <bfontecc@redhat.com>
+---
+ pyrpkg/cli.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 30129ce..c75827d 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1031,6 +1031,7 @@ see API KEY section of copr-cli(1) man page.
+ '--compose-id',
+ dest='compose_ids',
+ metavar='COMPOSE_ID',
++ type=int,
+ help='ODCS composes used. '
+ 'Cannot be used with --signing-intent or --repo-url',
+ nargs='*')
+--
+2.14.3
+
diff --git a/rpkg.spec b/rpkg.spec
index d6b549b..97516c3 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -3,7 +3,7 @@
Name: rpkg
Version: 1.51
-Release: 2%{?dist}
+Release: 3
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -11,6 +11,8 @@ URL: https://pagure.io/rpkg
Source0: https://pagure.io/releases/rpkg/%{name}-%{version}.tar.gz
Patch0: 0001-Fix-construct-anongiturl-for-chain-build.patch
Patch1: 0002-Fix-giturl-as-well-by-calling-construct_build_url.patch
+Patch2: 0001-Add-compose-id-and-signing-intent-arguments.patch
+Patch3: 0001-Change-type-of-compose-id-from-string-to-int.patch
BuildArch: noarch
@@ -95,6 +97,8 @@ A python library for managing RPM package sources in a git repository.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
@@ -144,6 +148,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jan 23 2018 Chenxiong Qi <cqi@redhat.com> - 1.51-3
+- Backport: Add compose-id and signing-intent arguments
+- Backport: Change type of compose id from string to int
+
* Wed Nov 08 2017 Chenxiong Qi <cqi@redhat.com> - 1.51-2
- Backport: Fix construct anongiturl for chain-build
- Backport: Fix giturl as well by calling construct_build_url
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-10 21:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-10 21:43 [rpms/rpkg] 1.70-1: New release 1.51-3 Chenxiong Qi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox