[rpms/rpkg] 1.70-1: Actually add the patches from b34edfe5f21fedb41e49e7dd256008617f0e26dc

[rpms/rpkg] 1.70-1: Actually add the patches from b34edfe5f21fedb41e49e7dd256008617f0e26dc

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

A new commit has been pushed.

Repo   : rpms/rpkg
Branch : 1.70-1
Commit : 777d297bd2ba234f07d78b4a8e53a461582ca38e
Author : Miro Hrončok <miro@hroncok.cz>
Date   : 2023-12-11T12:13:47+01:00
Stats  : +10/-32 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/rpkg/c/777d297bd2ba234f07d78b4a8e53a461582ca38e?branch=1.70-1

Log:
Actually add the patches from b34edfe5f21fedb41e49e7dd256008617f0e26dc

---
diff --git a/0031-Unittests-for-Undo-rpmautospec-processing.patch b/0031-Unittests-for-Undo-rpmautospec-processing.patch
index d3c3469..571872c 100644
--- a/0031-Unittests-for-Undo-rpmautospec-processing.patch
+++ b/0031-Unittests-for-Undo-rpmautospec-processing.patch
@@ -18,37 +18,6 @@ Signed-off-by: Ondřej Nosek <onosek@redhat.com>
  6 files changed, 116 insertions(+), 24 deletions(-)
  create mode 100644 tests/fixtures/docpkg/docpkg-rpmautospec.spec
 
-diff --git a/Jenkinsfile b/Jenkinsfile
-index 7b6742f..e6d6394 100644
---- a/Jenkinsfile
-+++ b/Jenkinsfile
-@@ -50,7 +50,7 @@ git fetch proposed
- git checkout "origin/$params.BRANCH_TO"
- git merge --no-ff "proposed/$params.BRANCH" -m "Merge PR"
- 
--podman run --rm -v .:/src:Z quay.io/exd-guild-source-tools/rpkg-test:latest tox -e py36,py39,flake8,bandit --workdir /tmp/tox ${TOX_POSARGS}
-+podman run --rm -v .:/src:Z quay.io/exd-guild-source-tools/rpkg-test:latest tox -e py36,py39,py311,flake8,bandit --workdir /tmp/tox ${TOX_POSARGS}
- # disabled py27 environment for now; keep just flake8 for Python 2
- podman run --rm -v .:/src:Z quay.io/exd-guild-source-tools/rpkg-test-py2:latest tox -e flake8python2 --workdir /tmp/tox ${TOX_POSARGS}
-                         """
-diff --git a/jenkins_test.dockerfile b/jenkins_test.dockerfile
-index df8762e..d217a55 100644
---- a/jenkins_test.dockerfile
-+++ b/jenkins_test.dockerfile
-@@ -1,4 +1,4 @@
--FROM fedora:37
-+FROM fedora:38
- LABEL \
-     name="rpkg test" \
-     description="Run tests using tox with Python 3" \
-@@ -9,6 +9,7 @@ RUN dnf -y update && dnf -y install \
-         python3-devel \
-         python3-openidc-client \
-         python3-libmodulemd \
-+        python3-rpmautospec \
-         python3-setuptools \
-         rpmlint \
-         rpm-build \
 diff --git a/pyrpkg/utils.py b/pyrpkg/utils.py
 index f3c8b25..fc01c7d 100644
 --- a/pyrpkg/utils.py

diff --git a/rpkg.spec b/rpkg.spec
index 1f4dcc2..4cdffff 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,6 +1,6 @@
 Name:           rpkg
 Version:        1.66
-Release:        13%{?dist}
+Release:        14%{?dist}
 
 Summary:        Python library for interacting with rpm+git
 License:        GPLv2+ and LGPLv2
@@ -62,6 +62,9 @@ Patch25:        0025-Fix-flake8-complaints.patch
 Patch26:        0026-Prepare-the-lookaside-cache-code-for-retries.patch
 Patch27:        0027-Lookaside-cache-operations-retries.patch
 Patch28:        0028-Make-lookaside-cache-retries-configurable.patch
+Patch29:        0029-pkg-import-Don-t-delete-changelog-generated-by-rpmau.patch
+Patch30:        0030-pkg-import-Undo-rpmautospec-processing.patch
+Patch31:        0031-Unittests-for-Undo-rpmautospec-processing.patch
 
 %description
 Python library for interacting with rpm+git
@@ -278,6 +281,12 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
 
 
 %changelog
+* Mon Dec 11 2023 Miro Hrončok <mhroncok@redhat.com> - 1.66-14
+- Actually add the patches:
+- Patch: *pkg import: Don't delete changelog generated by `rpmautospec convert`
+- Patch: *pkg import: Undo rpmautospec processing
+- Patch: Unittests for "Undo rpmautospec processing"
+
 * Wed Nov 22 2023 Ondřej Nosek <onosek@redhat.com> - 1.66-13
 - Patch: *pkg import: Don't delete changelog generated by `rpmautospec convert`
 - Patch: *pkg import: Undo rpmautospec processing