diff --git a/macros b/macros index 0ae36f3..0efbcac 100644 --- a/macros +++ b/macros @@ -259,3 +259,11 @@ # GDB is not yet ported on RISC-V to support Linux targets %_enable_debug_packages 0 %debug_package %{nil} + +# override /usr/lib/rpm/macros.d/macros.perl instead of modifying it in order +# to keep custom changes in one place (and no need to rebuild perl again). +# +# disable perl_default_subpackage_tests, which adds test suite subpackage to +# perl packages. It uses __spec_check_pre for it, which we also use above thus +# causing a breaking conflict. +%perl_default_subpackage_tests %{nil} diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index cd5b6a0..b904893 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -7,7 +7,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: 111 -Release: 1.2.riscv64%{?dist} +Release: 1.3.riscv64%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -184,6 +184,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Wed May 23 2018 David Abdurachmanov - 111-1.3.riscv64 +- Disable perl_default_subpackage_tests (test suite subpackage for perl packages) + * Sun May 06 2018 David Abdurachmanov - 111-1.2.riscv64 - Enable annobin for riscv64 (finally built, but untested)