From 85c7024acf3471238a7ef0b013519a9a1e26eaf8 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 11 Mar 2026 13:04:38 +0000 Subject: [PATCH] Update to 0.40.0 upstream release Upstream tag: 0.40.0 Upstream commit: c0061d82 Commit authored by Packit automation (https://packit.dev/) --- .packit.yaml | 64 +++++++----------------------------- README.packit | 2 +- plans/full.fmf | 8 ----- plans/main.fmf | 2 +- plans/packit-integration.fmf | 2 +- python-specfile.spec | 10 +++++- sources | 2 +- 7 files changed, 24 insertions(+), 66 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index c326264..283e1aa 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -49,22 +49,6 @@ packages: - python3 setup.py sdist --dist-dir ./epel8/ - bash -c "ls -1t ./epel8/*.tar.gz | head -n 1" - specfile-epel10: - <<: *specfile - specfile_path: &specfile_path_epel10 epel10/python-specfile.spec - files_to_sync: - - *specfile_path_epel10 - - .packit.yaml - - src: plans/ - dest: plans/ - - src: .fmf/ - dest: .fmf/ - actions: - <<: *actions - create-archive: - - python3 setup.py sdist --dist-dir ./epel10/ - - bash -c "ls -1t ./epel10/*.tar.gz | head -n 1" - # docs: https://gitlab.com/CentOS/Integration/packit-cbs/docs specfile-centos-integration-sig: <<: *specfile @@ -95,14 +79,11 @@ jobs: - fedora-all - fedora-all-aarch64 - epel-9 + - epel-10-all - <<: *copr_build_pr packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_pr - packages: [specfile-epel10] - targets: - - epel-10-all - &copr_build_commit_main job: copr_build @@ -113,6 +94,7 @@ jobs: - fedora-all - fedora-all-aarch64 - epel-9 + - epel-10-all project: packit-dev list_on_homepage: True preserve_project: True @@ -120,10 +102,6 @@ jobs: packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_commit_main - packages: [specfile-epel10] - targets: - - epel-10-all - &copr_build_commit_stable job: copr_build @@ -145,6 +123,7 @@ jobs: - fedora-all - fedora-all-aarch64 - epel-9 + - epel-10-all project: packit-releases list_on_homepage: True preserve_project: True @@ -152,10 +131,6 @@ jobs: packages: [specfile-epel8] targets: - epel-8 - - <<: *copr_build_release - packages: [specfile-epel10] - targets: - - epel-10-all - &tests job: tests @@ -165,6 +140,7 @@ jobs: targets: - fedora-all - epel-9 + - epel-10-all - <<: *tests identifier: performance tmt_plan: performance @@ -186,11 +162,6 @@ jobs: set -x dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm %end - - <<: *tests - packages: [specfile-epel10] - tmt_plan: "smoke|full" - targets: - - epel-10-all - &propose_downstream job: propose_downstream @@ -202,16 +173,13 @@ jobs: - fedora-branched - eln epel-9: {} + epel-10: + fast_forward_merge_into: + - epel-10-branched - <<: *propose_downstream packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *propose_downstream - packages: [specfile-epel10] - dist_git_branches: - epel-10: - fast_forward_merge_into: - - epel-10-branched - <<: *propose_downstream packages: [specfile-centos-integration-sig] dist_git_branches: @@ -227,16 +195,13 @@ jobs: - fedora-branched - eln epel-9: {} + epel-10: + fast_forward_merge_into: + - epel-10-branched - <<: *pull_from_upstream packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *pull_from_upstream - packages: [specfile-epel10] - dist_git_branches: - epel-10: - fast_forward_merge_into: - - epel-10-branched - <<: *pull_from_upstream packages: [specfile-centos-integration-sig] dist_git_branches: @@ -254,10 +219,6 @@ jobs: packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *koji_build - packages: [specfile-epel10] - dist_git_branches: - - epel-10-all - <<: *koji_build packages: [specfile-centos-integration-sig] dist_git_branches: @@ -268,6 +229,7 @@ jobs: - packit dist_git_branches: - fedora-all + - epel-10-all - &bodhi_update job: bodhi_update @@ -281,7 +243,3 @@ jobs: packages: [specfile-epel8] dist_git_branches: - epel-8 - - <<: *bodhi_update - packages: [specfile-epel10] - dist_git_branches: - - epel-10-all diff --git a/README.packit b/README.packit index 48ac383..4fa4a78 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.14.0.post1.dev14+gd507597e6. +The file was generated using packit 1.15.1.post1.dev2+g0a5916fb9. diff --git a/plans/full.fmf b/plans/full.fmf index dc00841..4ed1316 100644 --- a/plans/full.fmf +++ b/plans/full.fmf @@ -8,11 +8,3 @@ adjust: prepare+: - how: install package: python3 - - - when: "distro == rhel-10 or distro == centos-10 or distro == centos-stream-10" - because: "flexmock is not in EPEL 10: https://bugzilla.redhat.com/show_bug.cgi?id=2351835" - prepare+: - - how: install - package: python3-pip - - how: shell - script: pip3 install flexmock diff --git a/plans/main.fmf b/plans/main.fmf index 8c569ee..bfb28e0 100644 --- a/plans/main.fmf +++ b/plans/main.fmf @@ -1,6 +1,6 @@ discover: how: fmf url: https://github.com/packit/specfile.git - ref: d96a70a9f16b91b8973c733d889e3cce3948b525 + ref: c0061d82e6bed803b831e0b013f6b2ecb5092dcc execute: how: tmt diff --git a/plans/packit-integration.fmf b/plans/packit-integration.fmf index 38e1947..4815fad 100644 --- a/plans/packit-integration.fmf +++ b/plans/packit-integration.fmf @@ -2,7 +2,7 @@ discover: how: fmf url: https://github.com/packit/packit filter: tag:full - ref: d507597e6a4c9c2e456694de97d0353fe99e894f + ref: 0a5916fb95152c3262035294bedf9e2324a74008 prepare: - how: install copr: packit/packit-dev diff --git a/python-specfile.spec b/python-specfile.spec index 28d3e36..b0fe88d 100644 --- a/python-specfile.spec +++ b/python-specfile.spec @@ -7,7 +7,7 @@ Main focus is on modifying existing spec files, any change should result in a minimal diff.} -%global base_version 0.39.1 +%global base_version 0.40.0 #global prerelease rc1 %global package_version %{base_version}%{?prerelease:~%{prerelease}} @@ -32,6 +32,10 @@ BuildRequires: python3-devel BuildRequires: git-core %endif +# system-rpm-config pulls in packages containing SRPM macros +# necessary for spec file preprocessing and parsing +Recommends: system-rpm-config + %description %{desc} @@ -77,6 +81,10 @@ sed -i 's/setuptools_scm\[toml\]>=7/setuptools_scm[toml]/' pyproject.toml %changelog +* Wed Mar 11 2026 Packit - 0.40.0-1 +- `Specfile()` has a new `sanitize` option that enables best effort sanitization of potentially dangerous constructs such as shell expansions and unsafe Lua macros before they are passed to RPM for parsing. (#519) +- Fixed incorrect parsing of nested macros. (#522) + * Sat Feb 14 2026 Packit - 0.39.1-1 - Fixed whitespace padding of day of month in changelog entries. (#511) - Resolves: rhbz#2393435 diff --git a/sources b/sources index f3aae04..dd845d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (specfile-0.39.1.tar.gz) = ca33733958b89650baa2a53676f5757c6d4604656d8d74247a765aa37a33d1aa801a0e15e4ec57d66aa1b0e8b65030758db1cb2512a158fc372bc3736da990f0 +SHA512 (specfile-0.40.0.tar.gz) = be9f0b7862ca15f0564b7c39f04055db46d678096b86d472b8a3ff61d867e98fcb74e507de573bad88b45a049366ebac3fcf6abf975cc2c3f92e488ed80c4ea9