diff --git a/rpmlint.changes b/rpmlint.changes index 6bd974b..b2821f3 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 29 11:08:11 UTC 2021 - Martin Liška + +- Make rpmlint-strict only a simple package with one config file. + ------------------------------------------------------------------- Tue Jun 29 09:58:21 UTC 2021 - Martin Liška diff --git a/rpmlint.spec b/rpmlint.spec index fa6e859..50aa616 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -32,6 +32,7 @@ License: GPL-2.0-or-later URL: https://github.com/rpm-software-management/rpmlint Source0: rpmlint-%{version}.tar.xz Patch0: disable-flake.patch +%if "%flavor" != "strict" BuildRequires: appstream-glib BuildRequires: binutils BuildRequires: checkbashisms @@ -53,7 +54,6 @@ BuildRequires: python3-rpm BuildRequires: python3-toml BuildRequires: python3-zstd BuildRequires: xz -#!BuildIgnore: rpmlint-strict Requires: appstream-glib Requires: bash Requires: binutils @@ -78,8 +78,6 @@ BuildArch: noarch %ifarch x86_64 BuildRequires: glibc-32bit %endif -%if "%flavor" != "strict" -Conflicts: rpmlint-strict %endif %description @@ -90,21 +88,31 @@ source packages can be checked. %autosetup -p1 -n rpmlint-%{version} %build +%if "%flavor" != "strict" %python3_build +%endif %install +mkdir -p %{buildroot}%{_sysconfdir}/xdg/rpmlint +%if "%flavor" != "strict" %python3_install fdupes %{buildroot}%{python3_sitelib} -mkdir -p %{buildroot}%{_sysconfdir}/xdg/rpmlint install -m644 configs/openSUSE/* %{buildroot}%{_sysconfdir}/xdg/rpmlint %if "%flavor" != "strict" rm %{buildroot}%{_sysconfdir}/xdg/rpmlint/scoring-strict.override.toml %endif +%else +install -m644 configs/openSUSE/scoring-strict.override.toml %{buildroot}%{_sysconfdir}/xdg/rpmlint +%endif + +%if "%flavor" != "strict" %check python3 -m pytest +%endif %files +%if "%flavor" != "strict" %license COPYING %doc README* %{_bindir}/rpmlint @@ -113,4 +121,9 @@ python3 -m pytest %dir %{_sysconfdir}/xdg/rpmlint %config %{_sysconfdir}/xdg/rpmlint/* +%else +%dir %{_sysconfdir}/xdg/rpmlint +%config %{_sysconfdir}/xdg/rpmlint/scoring-strict.override.toml +%endif + %changelog