Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rpmlint for openSUSE:Factory checked
in at 2021-08-30 13:54:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rpmlint (Old)
and /work/SRC/openSUSE:Factory/.rpmlint.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rpmlint"
Mon Aug 30 13:54:59 2021 rev:357 rq:914534 version:2.1+git20210826.0220428
Changes:
--------
--- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2021-08-23
10:14:19.359815894 +0200
+++ /work/SRC/openSUSE:Factory/.rpmlint.new.1899/rpmlint.changes
2021-08-30 13:55:10.101819330 +0200
@@ -1,0 +2,16 @@
+Fri Aug 27 07:45:01 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Update package name for -M test.
+
+-------------------------------------------------------------------
+Thu Aug 26 12:15:55 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Add test multibuild target and reduce BuildRequirements for rpmlint
+ package itself.
+
+-------------------------------------------------------------------
+Wed Aug 25 15:04:29 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to opensuse tip.
+
+-------------------------------------------------------------------
@@ -6,0 +23,15 @@
+Wed Aug 18 08:22:54 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to version 2.1.
+
+-------------------------------------------------------------------
+Fri Aug 6 08:27:31 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Fix variable description expansion.
+
+-------------------------------------------------------------------
+Thu Aug 5 08:36:17 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Reduce Requirements for rpmlint-strict package.
+
+-------------------------------------------------------------------
@@ -9,0 +41,128 @@
+
+-------------------------------------------------------------------
+Thu Jul 22 15:18:57 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to tip (adds --mini-mode argument).
+
+-------------------------------------------------------------------
+Thu Jul 1 09:13:59 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to tip (fix not working -i option).
+
+-------------------------------------------------------------------
+Tue Jun 29 13:42:36 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to tip.
+
+-------------------------------------------------------------------
+Tue Jun 29 11:08:11 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Make rpmlint-strict only a simple package with one config file.
+
+-------------------------------------------------------------------
+Tue Jun 29 09:58:21 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Add Conflicts directive.
+
+-------------------------------------------------------------------
+Tue Jun 29 09:04:40 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Use BuildIgnore: rpmlint-strict in order to fix boo#1187749.
+
+-------------------------------------------------------------------
+Fri Jun 25 07:21:40 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to tip.
+- Rename scoring-strict.toml to scoring-strict.override.toml in order
+ to use override mechanism.
+
+-------------------------------------------------------------------
+Thu Jun 24 09:31:43 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Removed legacy patches:
+ * extend-suse-conffiles-check.diff
+ * docdata-examples.diff
+ * devel-provide-is-devel-package.diff
+ * fix-diag-sortorder.diff
+ * check-for-self-provides.diff
+
+- Add disable-flake.patch patch.
+
+-------------------------------------------------------------------
+Thu Jun 24 09:02:17 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Add rpmlint-strict sub-package that includes scoring-strict.toml.
+
+-------------------------------------------------------------------
+Thu Jun 24 08:49:39 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to tip: adds scoring-strict.toml config and BlockedFilters.
+
+-------------------------------------------------------------------
+Thu Jun 24 07:47:57 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Bump to tip, includes fix for Rust libraries.
+
+-------------------------------------------------------------------
+Thu Jun 17 08:26:05 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Install configs with 644.
+
+-------------------------------------------------------------------
+Thu May 27 10:52:32 UTC 2021 - Martin Li??ka <mli...@suse.cz>
+
+- Update to Rpmlint 2.0:
+ * RPMLint now is a "normal" Python application and now supports being
imported
+ like a standard Python module! This means that all the normal use-cases for
+ RPMLint are still supported, but now you can make it a part of larger
Python-based
+ applications or services.
+ * RPMLint uses a declarative TOML-based syntax for configuring RPMLint policy
+ instead of Python code.
+ * RPMLint now has an override system for the descriptions shown for various
checks,
+ so that distributions who want to give specific policy information can
+ do so without patching the code.
+ * RPMLint includes many more checks! Nearly all of the generally useful
checks created
+ by the openSUSE community have been merged into the tree, so distributions
can now
+ benefit from a wider offering of checks to implement policy enforcement.
+ * RPMLint is Python 3 only and now supports Python 3.6 and newer.
+ * RPMLint is now built and installed like a standard Python application
using setuptools.
+
+- Removed legacy patches:
+ * invalid-filerequires.diff
+ * no-badness-return.diff
+ * no-doc-for-lib.diff
+ * only-reg-files-are-scripts.diff
+ * remove-ghostfile-checks.diff
+ * rpm415-workaround.diff
+ * rpmgroup-checks.diff
+ * rpmlint-suse.diff
+ * suse-binarieschecks.diff
+ * suse-checks.diff
+ * suse-filter-exception.diff
+ * suse-filter-more-verbose.diff
+ * suse-ignore-specfile-errors.diff
+ * suse-pkg-config-check.diff
+ * suse-python3-naming-policy.diff
+ * suse-shlib-devel-dependency.diff
+ * suse-skip-macro-expansion.diff
+ * suse-speccheck-utf8.diff
+ * suse-url-check.diff
+ * suse-version.diff
+ * yast-provides.diff
+ * 0001-ZipCheck-Also-ignore-RuntimeError.patch
+ * accept-licenses-with-plus.patch
+ * add-check-for-a-non-zero-.text-segment-in-.a-archive.patch
+ * rpmlint-slpp-NUM-NUM.patch
+ * rpmlint-tests-sle15.patch
+ * suse-rpmlint-all-pie.patch
+ * suse-spdx-license-exceptions.patch
+ * suse-tests-without-badness.patch
+
+- Removed config fileS:
+ * config
+ * licenses.config
+ * pie.config
+
+- Removed misc files: syntax-validator.py, README.packaging.txt,
+ rpmlint-1.11.tar.gz, rpmlint-checks-master.tar.xz and
+ rpmlint-tests-84.87+git20210226.d6b66e2.tar.xz.
Old:
----
0001-ZipCheck-Also-ignore-RuntimeError.patch
README.packaging.txt
_servicedata
accept-licenses-with-plus.patch
add-check-for-a-non-zero-.text-segment-in-.a-archive.patch
check-for-self-provides.diff
config
devel-provide-is-devel-package.diff
docdata-examples.diff
extend-suse-conffiles-check.diff
fix-diag-sortorder.diff
invalid-filerequires.diff
licenses.config
no-badness-return.diff
no-doc-for-lib.diff
only-reg-files-are-scripts.diff
pie.config
remove-ghostfile-checks.diff
rpm415-workaround.diff
rpmgroup-checks.diff
rpmlint-1.11.tar.gz
rpmlint-checks-master.tar.xz
rpmlint-slpp-NUM-NUM.patch
rpmlint-suse.diff
rpmlint-tests-84.87+git20210226.d6b66e2.tar.xz
rpmlint-tests-sle15.patch
rpmlint-tests.changes
rpmlint-tests.spec
suse-binarieschecks.diff
suse-checks.diff
suse-filter-exception.diff
suse-filter-more-verbose.diff
suse-ignore-specfile-errors.diff
suse-pkg-config-check.diff
suse-python3-naming-policy.diff
suse-rpmlint-all-pie.patch
suse-shlib-devel-dependency.diff
suse-skip-macro-expansion.diff
suse-spdx-license-exceptions.patch
suse-speccheck-utf8.diff
suse-tests-without-badness.patch
suse-url-check.diff
suse-version.diff
syntax-validator.py
yast-provides.diff
New:
----
_multibuild
disable-flake.patch
rpmlint-2.1+git20210826.0220428.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rpmlint.spec ++++++
--- /var/tmp/diff_new_pack.GUBFfP/_old 2021-08-30 13:55:11.313820886 +0200
+++ /var/tmp/diff_new_pack.GUBFfP/_new 2021-08-30 13:55:11.317820891 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package rpmlint
+# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@@ -16,130 +16,115 @@
#
-Name: rpmlint
-Version: 1.11
+%define flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == ""
+%define name_suffix %{nil}
+%else
+%define name_suffix -%{flavor}
+%endif
+Name: rpmlint%{name_suffix}
+Version: 2.1+git20210826.0220428
Release: 0
Summary: RPM file correctness checker
License: GPL-2.0-or-later
-Group: System/Packages
URL: https://github.com/rpm-software-management/rpmlint
-Source0:
https://github.com/rpm-software-management/rpmlint/archive/rpmlint-%{version}.tar.gz
-Source1: rpmlint-checks-master.tar.xz
-Source2: config
-Source11: pie.config
-Source12: licenses.config
-Source99: README.packaging.txt
-Source100: syntax-validator.py
-Patch00: rpmlint-suse.diff
-Patch01: suse-checks.diff
-Patch02: suse-version.diff
-Patch03: suse-url-check.diff
-Patch04: suse-python3-naming-policy.diff
-Patch05: suse-tests-without-badness.patch
-Patch06: suse-pkg-config-check.diff
-Patch07: suse-binarieschecks.diff
-Patch08: no-doc-for-lib.diff
-Patch09: suse-filter-exception.diff
-Patch10: suse-spdx-license-exceptions.patch
-Patch11: suse-skip-macro-expansion.diff
-Patch23: suse-filter-more-verbose.diff
-Patch24: docdata-examples.diff
-Patch25: yast-provides.diff
-Patch29: rpmgroup-checks.diff
-Patch30: devel-provide-is-devel-package.diff
-Patch31: only-reg-files-are-scripts.diff
-Patch32: 0001-ZipCheck-Also-ignore-RuntimeError.patch
-Patch40: no-badness-return.diff
-Patch41: suse-shlib-devel-dependency.diff
-Patch49: extend-suse-conffiles-check.diff
-Patch51: suse-speccheck-utf8.diff
-Patch54: suse-ignore-specfile-errors.diff
-Patch55: invalid-filerequires.diff
-Patch57: check-for-self-provides.diff
-Patch58: remove-ghostfile-checks.diff
-Patch63: fix-diag-sortorder.diff
-Patch72: rpmlint-slpp-NUM-NUM.patch
-Patch77: suse-rpmlint-all-pie.patch
-Patch78: add-check-for-a-non-zero-.text-segment-in-.a-archive.patch
-Patch79: rpm415-workaround.diff
-Patch80: accept-licenses-with-plus.patch
+Source0: rpmlint-%{version}.tar.xz
+Patch0: disable-flake.patch
+BuildRequires: fdupes
+BuildRequires: python3-setuptools
+BuildArch: noarch
+%if "%{flavor}" == "test"
+BuildRequires: appstream-glib
+BuildRequires: binutils
+BuildRequires: checkbashisms
+BuildRequires: dash
BuildRequires: desktop-file-utils
-BuildRequires: obs-service-format_spec_file
-BuildRequires: python3-flake8
+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-runner
+BuildRequires: python3-pytest-xdist
+BuildRequires: python3-pyxdg
BuildRequires: python3-rpm
+BuildRequires: python3-toml
+BuildRequires: python3-zstd
BuildRequires: xz
-#!BuildIgnore: rpmlint-mini
-Requires: %{_bindir}/readelf
+%ifarch x86_64
+BuildRequires: glibc-32bit
+%endif
+%endif
+%if "%{flavor}" == ""
+Requires: appstream-glib
Requires: bash
+Requires: binutils
Requires: checkbashisms
Requires: cpio
Requires: dash
Requires: desktop-file-utils
Requires: file
Requires: findutils
+Requires: myspell-en_US
Requires: python3-magic
Requires: python3-pybeam
+Requires: python3-pyenchant
+Requires: python3-pyxdg
Requires: python3-rpm
+Requires: python3-toml
Requires: python3-xml
-BuildArch: noarch
+Requires: python3-zstd
+Requires: rpm-build
+%endif
%description
rpmlint is a tool to check common errors on RPM packages. Binary and
source packages can be checked.
%prep
-%autosetup -n rpmlint-rpmlint-%{version} -a1 -p1
-
-cp -p %{SOURCE2} .
-chmod a-x rpmlint-checks-master/*.py
-# Only move top-level python files
-mv rpmlint-checks-master/*.py .
+%autosetup -p1 -n rpmlint-%{version}
%build
-%make_build PYTHON=%{_bindir}/python3
+%if "%{flavor}" != "strict"
+%python3_build
+%endif
%install
-%make_install PYTHON=%{_bindir}/python3
-# the provided bash-completion does not work and only prints bash errors
-rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d
-mv %{buildroot}%{_sysconfdir}/rpmlint/config
%{buildroot}%{_datadir}/rpmlint/config
-head -n 8 %{buildroot}%{_datadir}/rpmlint/config >
%{buildroot}%{_sysconfdir}/rpmlint/config
-# make sure that the package is sane
-for f in %{buildroot}%{_datadir}/rpmlint/*.py
%{buildroot}%{_datadir}/rpmlint/config; do
- echo $f
- env LC_ALL=C.utf8 python3 -tt %{SOURCE100} $f
-done
-install -m 644 %{SOURCE11} %{buildroot}/%{_sysconfdir}/rpmlint/
-
-cp %{SOURCE12} licenses.config
-# note there is a tab character behind the -d, so don't copy&paste lightly
-cut '-d ' -f1
%{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes.txt | tail
-n +2 | sort -u | while read l; do
- sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config
-done
-# add some deprecated licenses we allow for now
-for l in AGPL-3.0 GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-3.0-with-GCC-exception \
- GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception
SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \
- GPL-1.0 GPL-2.0 GPL-3.0 LGPL-2.0 LGPL-2.1 LGPL-3.0; do
- sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config
-done
-install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/
+%if "%{flavor}" != "test"
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/rpmlint
+install -m644 configs/openSUSE/scoring-strict.override.toml
%{buildroot}%{_sysconfdir}/xdg/rpmlint
+%endif
+
+%if "%{flavor}" == ""
+%python3_install
+fdupes %{buildroot}%{python3_sitelib}
+install -m644 configs/openSUSE/* %{buildroot}%{_sysconfdir}/xdg/rpmlint
+rm %{buildroot}%{_sysconfdir}/xdg/rpmlint/scoring-strict.override.toml
+%endif
+%if "%{flavor}" == "test"
%check
-env PYTHON=%{_bindir}/python3 ./test.sh
+python3 -m pytest
+%endif
%files
+%if "%{flavor}" == ""
%license COPYING
%doc README*
%{_bindir}/rpmlint
%{_bindir}/rpmdiff
-%{_datadir}/rpmlint
-%config(noreplace) %{_sysconfdir}/rpmlint/config
-%config %{_sysconfdir}/rpmlint/pie.config
-%config %{_sysconfdir}/rpmlint/licenses.config
-%dir %{_sysconfdir}/rpmlint
-%{_mandir}/man1/rpmlint.1%{?ext_man}
-%{_mandir}/man1/rpmdiff.1%{?ext_man}
+%{python3_sitelib}/rpmlint*
+%dir %{_sysconfdir}/xdg/rpmlint
+%config %{_sysconfdir}/xdg/rpmlint/*
+
+%else
+%if "%{flavor}" == "strict"
+%dir %{_sysconfdir}/xdg/rpmlint
+%config %{_sysconfdir}/xdg/rpmlint/scoring-strict.override.toml
+%endif
+%endif
%changelog
++++++ _multibuild ++++++
<multibuild>
<package>strict</package>
<package>test</package>
</multibuild>
++++++ _service ++++++
--- /var/tmp/diff_new_pack.GUBFfP/_old 2021-08-30 13:55:11.373820963 +0200
+++ /var/tmp/diff_new_pack.GUBFfP/_new 2021-08-30 13:55:11.377820968 +0200
@@ -1,23 +1,13 @@
<services>
<service name="tar_scm" mode="disabled">
- <param name="version">1</param>
- <param name="versionformat">84.87+git%cd.%h</param>
- <param name="url">https://github.com/openSUSE/rpmlint-tests.git</param>
+ <param name="versionformat">2.1+git%cd.%h</param>
+ <param
name="url">https://github.com/rpm-software-management/rpmlint.git</param>
<param name="scm">git</param>
- <param name="changesgenerate">enable</param>
- </service>
- <service name="tar_scm" mode="disabled">
- <param name="version">1</param>
- <param name="versionformat">master</param>
- <param name="url">https://github.com/openSUSE/rpmlint-checks.git</param>
- <param name="scm">git</param>
- <param name="changesgenerate">enable</param>
+ <param name="revision">opensuse</param>
</service>
<service name="recompress" mode="disabled">
<param name="compression">xz</param>
<param name="file">*.tar</param>
</service>
- <service name="set_version" mode="disabled">
- <param name="file">rpmlint-tests.spec</param>
- </service>
+ <service name="set_version" mode="disabled" />
</services>
++++++ disable-flake.patch ++++++
diff --git a/setup.cfg b/setup.cfg
index 098f636..0ccb9dc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,4 +10,4 @@ import-order-style = google
application-import-names = Testing
[tool:pytest]
-addopts = -vv --cov=rpmlint -n auto --flake8
+addopts = -vv --cov=rpmlint -n auto
++++++ rpmlint-tests-84.87+git20210226.d6b66e2.tar.xz ->
rpmlint-2.1+git20210826.0220428.tar.xz ++++++
/work/SRC/openSUSE:Factory/rpmlint/rpmlint-tests-84.87+git20210226.d6b66e2.tar.xz
/work/SRC/openSUSE:Factory/.rpmlint.new.1899/rpmlint-2.1+git20210826.0220428.tar.xz
differ: char 15, line 1
