From a5b62b6ee786c7ef0bd0b3f4836ebcd2b1da09989d5fd11698ad61132b2a4086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Li=C5=A1ka?= <martin.liska@suse.com>
Date: Mon, 24 Apr 2023 08:35:43 +0000
Subject: [PATCH] - Update to version 2.4.0+git20230424.b8b7e4e:   * Remove
 trailing whitespace.   * pytest: fix one warning   * Introducing new file
 'pytest.ini' a conf file for pytest (#1047)   * Add rpmlint.svg with the new
 rpmlint logo -Rebase disable-flake-and-cov.patch.

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=1059
---
 _servicedata                             |  2 +-
 disable-flake-and-cov.patch              | 22 ++++++++++++----------
 rpmlint-2.4.0+git20230421.f2ea8ab.tar.xz |  3 ---
 rpmlint-2.4.0+git20230424.b8b7e4e.tar.xz |  3 +++
 rpmlint.changes                          | 10 ++++++++++
 rpmlint.spec                             |  2 +-
 6 files changed, 27 insertions(+), 15 deletions(-)
 delete mode 100644 rpmlint-2.4.0+git20230421.f2ea8ab.tar.xz
 create mode 100644 rpmlint-2.4.0+git20230424.b8b7e4e.tar.xz

diff --git a/_servicedata b/_servicedata
index 5a8a7e8..4d09e11 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/rpm-software-management/rpmlint.git</param>
-              <param name="changesrevision">f2ea8abf25b1e49778f00b77a5ee2ae7ad629962</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">b8b7e4e4787af7a8af8f58d8828c60036c000b1b</param></service></servicedata>
\ No newline at end of file
diff --git a/disable-flake-and-cov.patch b/disable-flake-and-cov.patch
index 659f448..4d525cd 100644
--- a/disable-flake-and-cov.patch
+++ b/disable-flake-and-cov.patch
@@ -1,10 +1,12 @@
-diff --git a/setup.cfg b/setup.cfg
-index f9d99831..3ef7694a 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -12,4 +12,4 @@ import-order-style = google
- application-import-names = Testing
- 
- [tool:pytest]
--addopts = -vv --cov=rpmlint -n auto -p no:legacypath
-+addopts = -vv -n auto -p no:legacypath
+diff --git a/pytest.ini b/pytest.ini
+index 819ea304..06b8aa7d 100644
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -1,7 +1,6 @@
+ [pytest]
+ addopts =
+     -vv
+-    --cov=rpmlint
+     -n auto
+     -p no:legacypath
+ pythonpath= .
diff --git a/rpmlint-2.4.0+git20230421.f2ea8ab.tar.xz b/rpmlint-2.4.0+git20230421.f2ea8ab.tar.xz
deleted file mode 100644
index f2b2bab..0000000
--- a/rpmlint-2.4.0+git20230421.f2ea8ab.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1479160cf9e44b7041b02a636a40380745df441e2876bd6d524c4cc5f880764
-size 7033956
diff --git a/rpmlint-2.4.0+git20230424.b8b7e4e.tar.xz b/rpmlint-2.4.0+git20230424.b8b7e4e.tar.xz
new file mode 100644
index 0000000..761b964
--- /dev/null
+++ b/rpmlint-2.4.0+git20230424.b8b7e4e.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0cb90c3df89d0ce8e047f102422375d03dedb9592ccc5a6aa8bf3b534e19fde
+size 7039572
diff --git a/rpmlint.changes b/rpmlint.changes
index ed9b9ae..e15ea33 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Apr 24 08:34:50 UTC 2023 - mliska@suse.cz
+
+- Update to version 2.4.0+git20230424.b8b7e4e:
+  * Remove trailing whitespace.
+  * pytest: fix one warning
+  * Introducing new file 'pytest.ini' a conf file for pytest (#1047)
+  * Add rpmlint.svg with the new rpmlint logo
+-Rebase disable-flake-and-cov.patch.
+
 -------------------------------------------------------------------
 Fri Apr 21 10:15:32 UTC 2023 - filippo.bonazzi@suse.com
 
diff --git a/rpmlint.spec b/rpmlint.spec
index 341b53e..8f5dbc4 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -23,7 +23,7 @@
 %define name_suffix -%{flavor}
 %endif
 Name:           rpmlint%{name_suffix}
-Version:        2.4.0+git20230421.f2ea8ab
+Version:        2.4.0+git20230424.b8b7e4e
 Release:        0
 Summary:        RPM file correctness checker
 License:        GPL-2.0-or-later