Fix Python provides
- Disable tests (will not work) - Enable back debug information (this is fixed now) - Rebuild for updated Python generators to fix Python Provides: Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
parent
044f52a054
commit
15e7b93604
31
rpm.spec
31
rpm.spec
@ -1,15 +1,3 @@
|
||||
%ifarch riscv64
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
# run internal testsuite?
|
||||
# fakechroot is severely broken beyond fedora 33, disable...
|
||||
%if 0%{?fedora} > 33 || 0%{?rhel} > 8
|
||||
%bcond_with check
|
||||
%else
|
||||
%bcond_without check
|
||||
%endif
|
||||
|
||||
# build against xz?
|
||||
%bcond_without xz
|
||||
# build with plugins?
|
||||
@ -42,7 +30,7 @@
|
||||
Summary: The RPM package management system
|
||||
Name: rpm
|
||||
Version: %{rpmver}
|
||||
Release: %{?snapver:0.%{snapver}.}%{baserelease}.1.riscv64%{?dist}
|
||||
Release: %{?snapver:0.%{snapver}.}%{baserelease}.2.riscv64%{?dist}
|
||||
Url: http://www.rpm.org/
|
||||
Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2
|
||||
|
||||
@ -77,11 +65,6 @@ Requires: popt%{_isa} >= 1.10.2.1
|
||||
Requires: curl
|
||||
Obsoletes: python2-rpm < %{version}-%{release}
|
||||
|
||||
%if %{with check}
|
||||
BuildRequires: fakechroot gnupg2
|
||||
BuildRequires: debugedit >= 0.3
|
||||
%endif
|
||||
|
||||
# XXX generally assumed to be installed but make it explicit as rpm
|
||||
# is a bit special...
|
||||
BuildRequires: redhat-rpm-config >= 94
|
||||
@ -426,13 +409,6 @@ rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,pythond*}
|
||||
rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*}
|
||||
rm -rf $RPM_BUILD_ROOT/var/tmp
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
make check TESTSUITEFLAGS=-j%{_smp_build_ncpus} || (cat tests/rpmtests.log; exit 1)
|
||||
# rpm >= 4.16.0 testsuite leaves a read-only tree behind, clean it up
|
||||
make clean
|
||||
%endif
|
||||
|
||||
%pre
|
||||
# Symlink all rpmdb files to the new location if we're still using /var/lib/rpm
|
||||
if [ -d /var/lib/rpm ]; then
|
||||
@ -616,6 +592,11 @@ fi
|
||||
%doc docs/librpm/html/*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 18 2022 David Abdurachmanov <davidlt@rivosinc.com> - 4.18.0-0.beta1.4.2.riscv64
|
||||
- Enable debug packages on riscv64
|
||||
- Disable testsuite
|
||||
- Rebuild for new Python generators (to fix Provides: )
|
||||
|
||||
* Tue Aug 09 2022 David Abdurachmanov <davidlt@rivosinc.com> - 4.18.0-0.beta1.4.1.riscv64
|
||||
- Enable the testsuite
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user