diff --git a/_servicedata b/_servicedata index 05ae94d..af7d4ee 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/rpm-software-management/rpmlint.git - 9d19882fbd62fb775cf0d2d793c8c7e266623fc0 \ No newline at end of file + ea27381c6214dfea317eb1bc1472f12fa74a90a8 \ No newline at end of file diff --git a/rpmlint-2.2.0+git20220506.414c402.tar.xz b/rpmlint-2.2.0+git20220506.414c402.tar.xz deleted file mode 100644 index 2357199..0000000 --- a/rpmlint-2.2.0+git20220506.414c402.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ef6a7f5420d968b8f4a6fdc2ca3051f3f258cf69fa0f611f7f2cd5d0c074768 -size 6748176 diff --git a/rpmlint-2.2.0+git20220509.ea27381.tar.xz b/rpmlint-2.2.0+git20220509.ea27381.tar.xz new file mode 100644 index 0000000..145b256 --- /dev/null +++ b/rpmlint-2.2.0+git20220509.ea27381.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e9243e6e96eb74c411321a7631651aa035c7513dce7a943527c3e85468c64fb +size 6748000 diff --git a/rpmlint.changes b/rpmlint.changes index 33d4589..388a6f2 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon May 09 07:21:47 UTC 2022 - mliska@suse.cz + +- Update to version 2.2.0+git20220509.ea27381: + * Fix wrong git merge conflict resolution. + * ErlangCheck: remove unneeded str() from the test + ------------------------------------------------------------------- Fri May 06 08:52:29 UTC 2022 - mliska@suse.cz diff --git a/rpmlint.spec b/rpmlint.spec index 2710966..6658608 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.2.0+git20220506.414c402 +Version: 2.2.0+git20220509.ea27381 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later