pagure pushed to rpms/redhat-rpm-config (rawhide).
"%set_build_flags: unconditionally set RUSTFLAGS"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:08:00 UTC
From 16122a6127619370f6ac639f9913243c98884ec5 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell(a)gtmx.me>
Date: Mar 01 2023 00:29:18 +0000
Subject: %set_build_flags: unconditionally set RUSTFLAGS
---
diff --git a/macros b/macros
index c69ba73..d9e283d 100644
--- a/macros
+++ b/macros
@@ -86,15 +86,13 @@
# have not been set already. RPM_OPT_FLAGS and RPM_LD_FLAGS have already
# been set implicitly at the start of the %%build section.
# LT_SYS_LIBRARY_PATH is used by libtool script.
-# RUSTFLAGS is only set when rust-packaging which defines %%{build_rustflags} is
-# available.
%set_build_flags \
CFLAGS="${CFLAGS:-%{build_cflags}}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%{build_cxxflags}}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%{build_fflags}}" ; export FFLAGS ; \
FCFLAGS="${FCFLAGS:-%{build_fflags}}" ; export FCFLAGS ; \
- VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ;%{?build_rustflags:
- RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ;} \
+ VALAFLAGS="${VALAFLAGS:-%{build_valaflags}}" ; export VALAFLAGS ; \
+ RUSTFLAGS="${RUSTFLAGS:-%{build_rustflags}}" ; export RUSTFLAGS ; \
LDFLAGS="${LDFLAGS:-%{build_ldflags}}" ; export LDFLAGS ; \
LT_SYS_LIBRARY_PATH="${LT_SYS_LIBRARY_PATH:-%_libdir:}" ; export LT_SYS_LIBRARY_PATH ; \
CC="${CC:-%{__cc}}" ; export CC ; \
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index ffb1e04..ab4192f 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -103,7 +103,8 @@ Requires: perl-srpm-macros
# ↓ Has Python BRPs originaly present in redhat-rpm-config
Requires: python-srpm-macros >= 3.11-7
Requires: qt5-srpm-macros
-Requires: rust-srpm-macros
+# rust-srpm-macros v24 contains %%build_rustflags defintion
+Requires: rust-srpm-macros >= 24
Requires: rpmautospec-rpm-macros
Requires: package-notes-srpm-macros
Requires: pyproject-srpm-macros
https://src.fedoraproject.org/rpms/redhat-rpm-config/c/16122a6127619370f6...
1Â year, 2Â months
pagure pushed to rpms/redhat-rpm-config (rawhide). "Test RUSTFLAGS addition"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:08:00 UTC
From 4d945d4291393e052fec4d5b3a79d94b7bd6bbf3 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell(a)gtmx.me>
Date: Mar 01 2023 00:29:18 +0000
Subject: Test RUSTFLAGS addition
---
diff --git a/tests/rustflags/main.fmf b/tests/rustflags/main.fmf
new file mode 100644
index 0000000..02226e2
--- /dev/null
+++ b/tests/rustflags/main.fmf
@@ -0,0 +1,7 @@
+summary: Test that conditional support for RUSTFLAGS works
+
+require:
+ - redhat-rpm-config
+ - rpm
+ - rust-packaging
+test: ./runtest.sh
diff --git a/tests/rustflags/runtest.sh b/tests/rustflags/runtest.sh
new file mode 100755
index 0000000..b6a3be0
--- /dev/null
+++ b/tests/rustflags/runtest.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+set -e -u -o pipefail
+
+# Allow for local testing
+rargs=()
+if [ -n "${MACROS_PATH:-}" ]; then
+ default_macros_path="$(rpm --showrc | grep 'Macro path' | awk -F ': ' '{print $2}')"
+ rargs+=("--macros" "${default_macros_path}:${MACROS_PATH}")
+fi
+
+build_rustflags="$(rpm -E '%{build_rustflags}')"
+# For good measure
+[ "${build_rustflags}" != "%{build_rustflags}" ]
+#
+flags="$(rpm "${rargs[@]}" -E '%set_build_flags')"
+
+echo 'Check that RUSTFLAGS is set after evaluating %set_build_flags'
+(
+ eval "${flags}"
+ # set -u will make this fail if $RUSTFLAGS isn't defined
+ [ "${RUSTFLAGS}" = "${build_rustflags}" ]
+)
https://src.fedoraproject.org/rpms/redhat-rpm-config/c/4d945d4291393e052f...
1Â year, 2Â months
qulogic pushed to rpms/python-geoplot (rawhide). "Fix tests with
Matplotlib 3.7"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 01:04:01 UTC
From 2a84a18935b09688e56c5952da6e76473504fd9e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Mar 01 2023 01:03:09 +0000
Subject: Fix tests with Matplotlib 3.7
---
diff --git a/0001-Remove-some-unavailable-test-dependencies.patch b/0001-Remove-some-unavailable-test-dependencies.patch
index 22e7178..da91698 100644
--- a/0001-Remove-some-unavailable-test-dependencies.patch
+++ b/0001-Remove-some-unavailable-test-dependencies.patch
@@ -1,7 +1,7 @@
-From aca2bc24fa605ad85060108cd86292f9a607b5f0 Mon Sep 17 00:00:00 2001
+From e796490b4189fa22ba169a820831c99a4e9a2b37 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
Date: Sat, 11 Sep 2021 16:16:34 -0400
-Subject: [PATCH] Remove some unavailable test dependencies
+Subject: [PATCH 1/2] Remove some unavailable test dependencies
Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
---
@@ -9,7 +9,7 @@ Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
-index cb83ebf..e8d1ab1 100644
+index cf6bf85..58bea4d 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup
@@ -22,5 +22,5 @@ index cb83ebf..e8d1ab1 100644
test_requires = ['pytest', 'pytest-mpl', 'scipy']
--
-2.35.1
+2.39.2
diff --git a/0002-Fix-tests-with-Matplotlib-3.7.patch b/0002-Fix-tests-with-Matplotlib-3.7.patch
new file mode 100644
index 0000000..5b60f97
--- /dev/null
+++ b/0002-Fix-tests-with-Matplotlib-3.7.patch
@@ -0,0 +1,26 @@
+From 9708d32df2ff149a6f2110562128325490c97fa0 Mon Sep 17 00:00:00 2001
+From: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
+Date: Tue, 28 Feb 2023 19:50:46 -0500
+Subject: [PATCH 2/2] Fix tests with Matplotlib 3.7
+
+Signed-off-by: Elliott Sales de Andrade <quantum.analyst(a)gmail.com>
+---
+ tests/mixin_tests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/mixin_tests.py b/tests/mixin_tests.py
+index a7b3b90..117b007 100644
+--- a/tests/mixin_tests.py
++++ b/tests/mixin_tests.py
+@@ -6,7 +6,7 @@ import geopandas as gpd
+ import unittest
+ import pytest
+ import matplotlib.pyplot as plt
+-from matplotlib.axes._subplots import SubplotBase
++from matplotlib.axes import SubplotBase
+ from matplotlib.cm import ScalarMappable
+ from matplotlib.colors import LinearSegmentedColormap, Normalize
+ import cartopy.crs as ccrs
+--
+2.39.2
+
diff --git a/python-geoplot.spec b/python-geoplot.spec
index 3f15ee8..c40f423 100644
--- a/python-geoplot.spec
+++ b/python-geoplot.spec
@@ -12,14 +12,16 @@ URL: https://github.com/ResidentMario/geoplot
# PyPI tarball does not include tests.
Source0: https://github.com/ResidentMario/%{srcname}/archive/%{version}/%{srcname}...
# Fedora specific
-Patch0001: 0001-Remove-some-unavailable-test-dependencies.patch
+Patch: 0001-Remove-some-unavailable-test-dependencies.patch
+# https://github.com/ResidentMario/geoplot/pull/286
+Patch: 0002-Fix-tests-with-Matplotlib-3.7.patch
# Accommodate UserWarning not in geopandas 0.11
# https://github.com/ResidentMario/geoplot/pull/285
# Fixes:
# Tests fail with geopandas 0.11
# https://github.com/ResidentMario/geoplot/issues/283
# https://bugzilla.redhat.com/show_bug.cgi?id=2148633
-Patch0002: https://github.com/ResidentMario/%{srcname}/pull/285.patch
+Patch: https://github.com/ResidentMario/%{srcname}/pull/285.patch
BuildArch: noarch
https://src.fedoraproject.org/rpms/python-geoplot/c/2a84a18935b09688e56c5...
1Â year, 2Â months
onosek pushed to rpms/rpkg (epel8). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:32 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months
onosek pushed to rpms/rpkg (epel9). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:35 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months
onosek pushed to rpms/rpkg (epel7). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:29 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months
onosek pushed to rpms/rpkg (f38). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:26 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months
onosek pushed to rpms/rpkg (f37). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:23 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months
onosek pushed to rpms/rpkg (f36). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:20 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months
onosek pushed to rpms/rpkg (rawhide). "Two patches for previous 1.66
release (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-01 00:59:18 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001
From: Ondřej Nosek <onosek(a)redhat.com>
Date: Mar 01 2023 00:55:29 +0000
Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook
- container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek <onosek(a)redhat.com>
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
new file mode 100644
index 0000000..e252038
--- /dev/null
+++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
@@ -0,0 +1,42 @@
+From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar(a)redhat.com>
+Date: Mon, 27 Feb 2023 08:36:20 +0100
+Subject: [PATCH] Process source URLs with fragment in pre-push hook
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some download services do not have the actual filename in the URL.
+Packagers work around that by adding a fragment to the URL. This is then
+ignored by any server, but tricks RPM into getting the correct filename.
+
+Example:
+
+ Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate
+
+The filename is obviously `actix-0.13.0.crate`, but rpkg without this
+patch will come up with `download`.
+
+Signed-off-by: LubomÃr Sedlář <lsedlar(a)redhat.com>
+---
+ pyrpkg/__init__.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
+index 6a0e9eb..c650851 100644
+--- a/pyrpkg/__init__.py
++++ b/pyrpkg/__init__.py
+@@ -4464,7 +4464,9 @@ class Commands(object):
+ # find out the format of the source file path. From URL use just the file name.
+ # We want to keep hierarchy of the files if possible
+ res = urllib.parse.urlparse(file_location)
+- if res.scheme and res.netloc:
++ if res.scheme and res.fragment:
++ source_files.append(os.path.basename(res.fragment))
++ elif res.scheme and res.netloc:
+ source_files.append(os.path.basename(res.path))
+ else:
+ source_files.append(file_location)
+--
+2.39.2
+
diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
new file mode 100644
index 0000000..4ead6a3
--- /dev/null
+++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch
@@ -0,0 +1,30 @@
+From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <kdreyer(a)redhat.com>
+Date: Tue, 28 Feb 2023 16:17:03 -0500
+Subject: [PATCH] container-build: update --signing-intent help for OSBS 2
+
+OSBS 2 logs the reactor configuration in a slightly different way.
+Update the --help text for --signing-intent to point users at the new
+location.
+
+Signed-off-by: Ken Dreyer <kdreyer(a)redhat.com>
+---
+ pyrpkg/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py
+index 41c4354..c3672b3 100644
+--- a/pyrpkg/cli.py
++++ b/pyrpkg/cli.py
+@@ -1724,7 +1724,7 @@ class cliClient(object):
+ " server. If unspecified, the server will use the signing intent"
+ " of the compose_ids you specify, or the server's"
+ " default_signing_intent. To view the full list of possible"
+- " names, see REACTOR_CONFIG in orchestrator.log.")
++ " names, see atomic_reactor.config in osbs-build.log.")
+
+ parser.add_argument(
+ '--skip-remote-rules-validation',
+--
+2.39.2
+
diff --git a/rpkg.spec b/rpkg.spec
index 3d46980..4c557e0 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
Name: rpkg
Version: 1.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Python library for interacting with rpm+git
License: GPLv2+ and LGPLv2
@@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch
%if 0%{?with_python2}
Patch3: 0003-Remove-Environment-Markers-syntax.patch
%endif
+Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch
+Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description
Python library for interacting with rpm+git
@@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog
+* Wed Mar 1 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-3
+- Patch: Process source URLs with fragment in pre-push hook
+- Patch: container-build: update --signing-intent help for OSBS 2
+
* Tue Feb 21 2023 Ondřej Nosek <onosek(a)redhat.com> - 1.66-2
- rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b...
1Â year, 2Â months