Accepting request 914408 from home:marxin:branches:devel:openSUSE:Factory:rpmlint
- Add test multibuild target and reduce BuildRequirements for rpmlint package itself. OBS-URL: https://build.opensuse.org/request/show/914408 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=802
This commit is contained in:
parent
4df04b4fbc
commit
a5f2d982db
@ -1,3 +1,4 @@
|
|||||||
<multibuild>
|
<multibuild>
|
||||||
<package>strict</package>
|
<package>strict</package>
|
||||||
|
<package>test</package>
|
||||||
</multibuild>
|
</multibuild>
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 26 12:15:55 UTC 2021 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
|
- Add test multibuild target and reduce BuildRequirements for rpmlint
|
||||||
|
package itself.
|
||||||
|
|
||||||
Wed Aug 25 15:04:29 UTC 2021 - Martin Liška <mliska@suse.cz>
|
Wed Aug 25 15:04:29 UTC 2021 - Martin Liška <mliska@suse.cz>
|
||||||
|
|
||||||
- Bump to opensuse tip.
|
- Bump to opensuse tip.
|
||||||
|
40
rpmlint.spec
40
rpmlint.spec
@ -17,13 +17,11 @@
|
|||||||
|
|
||||||
|
|
||||||
%define flavor @BUILD_FLAVOR@%{nil}
|
%define flavor @BUILD_FLAVOR@%{nil}
|
||||||
|
%if "%{flavor}" == "strict"
|
||||||
%if "%flavor" == "strict"
|
|
||||||
%define name_suffix -%{flavor}
|
%define name_suffix -%{flavor}
|
||||||
%else
|
%else
|
||||||
%define name_suffix %{nil}
|
%define name_suffix %{nil}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: rpmlint%{name_suffix}
|
Name: rpmlint%{name_suffix}
|
||||||
Version: 2.1+git20210826.0220428
|
Version: 2.1+git20210826.0220428
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -32,12 +30,15 @@ License: GPL-2.0-or-later
|
|||||||
URL: https://github.com/rpm-software-management/rpmlint
|
URL: https://github.com/rpm-software-management/rpmlint
|
||||||
Source0: rpmlint-%{version}.tar.xz
|
Source0: rpmlint-%{version}.tar.xz
|
||||||
Patch0: disable-flake.patch
|
Patch0: disable-flake.patch
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: python3-setuptools
|
||||||
|
BuildArch: noarch
|
||||||
|
%if "%{flavor}" == "test"
|
||||||
BuildRequires: appstream-glib
|
BuildRequires: appstream-glib
|
||||||
BuildRequires: binutils
|
BuildRequires: binutils
|
||||||
BuildRequires: checkbashisms
|
BuildRequires: checkbashisms
|
||||||
BuildRequires: dash
|
BuildRequires: dash
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: fdupes
|
|
||||||
BuildRequires: myspell-cs_CZ
|
BuildRequires: myspell-cs_CZ
|
||||||
BuildRequires: myspell-en_US
|
BuildRequires: myspell-en_US
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
@ -56,7 +57,8 @@ BuildRequires: xz
|
|||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
BuildRequires: glibc-32bit
|
BuildRequires: glibc-32bit
|
||||||
%endif
|
%endif
|
||||||
%if "%flavor" != "strict"
|
%endif
|
||||||
|
%if "%{flavor}" == ""
|
||||||
Requires: appstream-glib
|
Requires: appstream-glib
|
||||||
Requires: bash
|
Requires: bash
|
||||||
Requires: binutils
|
Requires: binutils
|
||||||
@ -72,15 +74,12 @@ Requires: python3-pybeam
|
|||||||
Requires: python3-pyenchant
|
Requires: python3-pyenchant
|
||||||
Requires: python3-pyxdg
|
Requires: python3-pyxdg
|
||||||
Requires: python3-rpm
|
Requires: python3-rpm
|
||||||
Requires: python3-setuptools
|
|
||||||
Requires: python3-toml
|
Requires: python3-toml
|
||||||
Requires: python3-xml
|
Requires: python3-xml
|
||||||
Requires: python3-zstd
|
Requires: python3-zstd
|
||||||
Requires: rpm-build
|
Requires: rpm-build
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
rpmlint is a tool to check common errors on RPM packages. Binary and
|
rpmlint is a tool to check common errors on RPM packages. Binary and
|
||||||
source packages can be checked.
|
source packages can be checked.
|
||||||
@ -89,31 +88,30 @@ source packages can be checked.
|
|||||||
%autosetup -p1 -n rpmlint-%{version}
|
%autosetup -p1 -n rpmlint-%{version}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if "%flavor" != "strict"
|
%if "%{flavor}" != "strict"
|
||||||
%python3_build
|
%python3_build
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
%if "%{flavor}" != "test"
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/xdg/rpmlint
|
mkdir -p %{buildroot}%{_sysconfdir}/xdg/rpmlint
|
||||||
%if "%flavor" != "strict"
|
|
||||||
%python3_install
|
|
||||||
fdupes %{buildroot}%{python3_sitelib}
|
|
||||||
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
|
install -m644 configs/openSUSE/scoring-strict.override.toml %{buildroot}%{_sysconfdir}/xdg/rpmlint
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if "%flavor" != "strict"
|
%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
|
%check
|
||||||
python3 -m pytest
|
python3 -m pytest
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%if "%flavor" != "strict"
|
%if "%{flavor}" == ""
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc README*
|
%doc README*
|
||||||
%{_bindir}/rpmlint
|
%{_bindir}/rpmlint
|
||||||
@ -123,8 +121,10 @@ python3 -m pytest
|
|||||||
%config %{_sysconfdir}/xdg/rpmlint/*
|
%config %{_sysconfdir}/xdg/rpmlint/*
|
||||||
|
|
||||||
%else
|
%else
|
||||||
|
%if "%{flavor}" == "strict"
|
||||||
%dir %{_sysconfdir}/xdg/rpmlint
|
%dir %{_sysconfdir}/xdg/rpmlint
|
||||||
%config %{_sysconfdir}/xdg/rpmlint/scoring-strict.override.toml
|
%config %{_sysconfdir}/xdg/rpmlint/scoring-strict.override.toml
|
||||||
%endif
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user