From 6fdf391946a457381445f5c3bb011c5925dfec82828400b85d5a2ce22a40418e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Li=C5=A1ka?= Date: Thu, 18 Aug 2022 15:58:47 +0000 Subject: [PATCH 1/2] - Update to version 2.3.0+git20220818.a8685c5d: * dbus-services: whitelist systemd-experimental: systemd-oomd (bsc#1202454) OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=950 --- _servicedata | 2 +- rpmlint-2.3.0+git20220812.05423f8d.tar.xz | 3 --- rpmlint-2.3.0+git20220818.a8685c5d.tar.xz | 3 +++ rpmlint.changes | 6 ++++++ rpmlint.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 rpmlint-2.3.0+git20220812.05423f8d.tar.xz create mode 100644 rpmlint-2.3.0+git20220818.a8685c5d.tar.xz diff --git a/_servicedata b/_servicedata index f2ba291..913910c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/rpm-software-management/rpmlint.git - 0a796e1016515188bbe03bfccf6ed85bb2246a87 \ No newline at end of file + fac54b7e3e9ee15b23a88194449d1e8ce56c04e1 \ No newline at end of file diff --git a/rpmlint-2.3.0+git20220812.05423f8d.tar.xz b/rpmlint-2.3.0+git20220812.05423f8d.tar.xz deleted file mode 100644 index 2dd812c..0000000 --- a/rpmlint-2.3.0+git20220812.05423f8d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4b8d6796fdf5729d942c54c37079325dc477027e5853b1e0dfe7335e090b2df6 -size 6754132 diff --git a/rpmlint-2.3.0+git20220818.a8685c5d.tar.xz b/rpmlint-2.3.0+git20220818.a8685c5d.tar.xz new file mode 100644 index 0000000..ec73ae8 --- /dev/null +++ b/rpmlint-2.3.0+git20220818.a8685c5d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1749f960bbf83949a62018848595fe84b0d7cb7d1966ff640794799511d5c5e +size 6754128 diff --git a/rpmlint.changes b/rpmlint.changes index 9f106ea..62ed643 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 18 15:55:46 UTC 2022 - mliska@suse.cz + +- Update to version 2.3.0+git20220818.a8685c5d: + * dbus-services: whitelist systemd-experimental: systemd-oomd (bsc#1202454) + ------------------------------------------------------------------- Fri Aug 12 12:15:02 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index 88a27df..de80788 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.3.0+git20220812.05423f8d +Version: 2.3.0+git20220818.a8685c5d Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later From 94524af3e1a26b3679fceb03397531d9613fc758f45a9b9ec6f9af82189291ec Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 19 Aug 2022 06:42:04 +0000 Subject: [PATCH 2/2] Accepting request 998044 from home:bnavigator:branches:devel:openSUSE:Factory:rpmlint - Enhance disable-flake.patch to disable-flake-and-cov.patch - Reflect the requirements from setup.py in the rpm requirements: Use tomli until we have python3 = 3.11 OBS-URL: https://build.opensuse.org/request/show/998044 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=951 --- disable-flake.patch => disable-flake-and-cov.patch | 2 +- rpmlint.changes | 7 +++++++ rpmlint.spec | 13 ++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) rename disable-flake.patch => disable-flake-and-cov.patch (86%) diff --git a/disable-flake.patch b/disable-flake-and-cov.patch similarity index 86% rename from disable-flake.patch rename to disable-flake-and-cov.patch index 66d6de0..be4ac53 100644 --- a/disable-flake.patch +++ b/disable-flake-and-cov.patch @@ -7,4 +7,4 @@ index 098f636..0ccb9dc 100644 [tool:pytest] -addopts = -vv --cov=rpmlint -n auto --flake8 -+addopts = -vv --cov=rpmlint -n auto ++addopts = -vv -n auto diff --git a/rpmlint.changes b/rpmlint.changes index 62ed643..aed18d5 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 18 21:26:31 UTC 2022 - Ben Greiner + +- Enhance disable-flake.patch to disable-flake-and-cov.patch +- Reflect the requirements from setup.py in the rpm requirements: + Use tomli until we have python3 = 3.11 + ------------------------------------------------------------------- Thu Aug 18 15:55:46 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index de80788..f969d7e 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -29,8 +29,9 @@ Summary: RPM file correctness checker License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/rpmlint Source0: rpmlint-%{version}.tar.xz -Patch0: disable-flake.patch +Patch0: disable-flake-and-cov.patch BuildRequires: fdupes +BuildRequires: python-rpm-macros BuildRequires: python3-setuptools BuildArch: noarch %if "%{flavor}" == "test" @@ -41,16 +42,16 @@ BuildRequires: dash BuildRequires: desktop-file-utils BuildRequires: myspell-cs_CZ BuildRequires: myspell-en_US -BuildRequires: python-rpm-macros BuildRequires: python3-magic BuildRequires: python3-pybeam BuildRequires: python3-pyenchant BuildRequires: python3-pytest -BuildRequires: python3-pytest-cov BuildRequires: python3-pytest-xdist BuildRequires: python3-pyxdg BuildRequires: python3-rpm +%if 0%{?python3_version_nodots < 311} BuildRequires: python3-tomli +%endif BuildRequires: python3-tomli-w BuildRequires: python3-zstandard BuildRequires: xz @@ -74,8 +75,10 @@ Requires: python3-pybeam Requires: python3-pyenchant Requires: python3-pyxdg Requires: python3-rpm -Requires: python3-toml -Requires: python3-xml +%if 0%{?python3_version_nodots < 311} +Requires: python3-tomli +%endif +Requires: python3-tomli-w Requires: python3-zstandard Requires: rpm-build %endif