From a9fe1c61426077f2b5b043f4d020ebb47eb3a06a Mon Sep 17 00:00:00 2001 From: Matthew Almond Date: Aug 04 2021 00:00:36 +0000 Subject: Move rpm2extents to plugin package This removes the binary if you're not using the plugin. Also renumber patches to allow measure plugin next --- diff --git a/SPECS/rpm.spec b/SPECS/rpm.spec index 96e3236..bf701e7 100644 --- a/SPECS/rpm.spec +++ b/SPECS/rpm.spec @@ -32,7 +32,7 @@ %global rpmver 4.14.3 #global snapver rc2 -%global rel 15.2 +%global rel 15.3 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -179,9 +179,9 @@ Patch1981: 0032-rpmsign-Add-argument-to-specify-algorithm-for-fsveri.patch Patch1982: 0033-Enable-fsverity-in-CI.patch %endif -Patch9998: https://github.com/rpm-software-management/rpm/pull/1381.patch +Patch9990: https://github.com/rpm-software-management/rpm/pull/1381.patch Provides: rpm(pr1381) -Patch9999: https://github.com/rpm-software-management/rpm/pull/1470.patch +Patch9991: https://github.com/rpm-software-management/rpm/pull/1470.patch Provides: rpm(pr1470) # Partially GPL/LGPL dual-licensed and some bits with BSD @@ -627,7 +627,6 @@ make check || cat tests/rpmtests.log %{_bindir}/rpm2archive %endif %{_bindir}/rpm2cpio -%{_bindir}/rpm2extents %{_bindir}/rpmdb %{_bindir}/rpmkeys %{_bindir}/rpmquery @@ -697,6 +696,7 @@ make check || cat tests/rpmtests.log %{_mandir}/man8/rpm-plugin-fapolicyd.8* %files plugin-reflink +%{_bindir}/rpm2extents %{_libdir}/rpm-plugins/reflink.so %endif # with plugins @@ -760,6 +760,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Tue Aug 03 2021 Matthew Almond - 4.14.3-15.3 +- Move rpm2extents to plugin package + * Tue Aug 03 2021 Matthew Almond - 4.14.3-15.2 - Added fsverity backport