From 63a01f5b396f9cc0f54bda3c81c8552017e8d41a Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 3 Oct 2022 15:40:53 +0300 Subject: [PATCH] Start utilizing %patchlist, finally No actual patch changes. --- rpm.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/rpm.spec b/rpm.spec index aad2d74..ddde5ca 100644 --- a/rpm.spec +++ b/rpm.spec @@ -48,20 +48,6 @@ Source10: rpmdb-rebuild.service Source20: rpmdb-migrate.service Source21: rpmdb_migrate -# Set rpmdb path to /usr/lib/sysimage/rpm -Patch0: rpm-4.17.x-rpm_dbpath.patch -# Disable autoconf config.site processing (#962837) -Patch1: rpm-4.17.x-siteconfig.patch -# In current Fedora, man-pages pkg owns all the localized man directories -Patch3: rpm-4.9.90-no-man-dirs.patch - -# Patches already upstream: - -# These are not yet upstream -Patch906: rpm-4.7.1-geode-i686.patch -# Probably to be upstreamed in slightly different form -Patch907: rpm-4.15.x-ldflags.patch - # Partially GPL/LGPL dual-licensed and some bits with BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD License: GPLv2+ @@ -129,6 +115,22 @@ Requires(pre): coreutils Requires(pre): findutils Requires(pre): sed +%patchlist +# Set rpmdb path to /usr/lib/sysimage/rpm +rpm-4.17.x-rpm_dbpath.patch +# Disable autoconf config.site processing (#962837) +rpm-4.17.x-siteconfig.patch +# In current Fedora, man-pages pkg owns all the localized man directories +rpm-4.9.90-no-man-dirs.patch + +# Patches already upstream: +# ... + +# These are not yet upstream +rpm-4.7.1-geode-i686.patch +# Probably to be upstreamed in slightly different form +rpm-4.15.x-ldflags.patch + %description The RPM Package Manager (RPM) is a powerful command line driven package management system capable of installing, uninstalling, @@ -609,6 +611,7 @@ fi %changelog * Mon Oct 03 2022 Panu Matilainen - 4.18.0-2 - Drop the temporary build-dependency on pandoc before it grows a beard +- Start utilizing %%patchlist, finally * Wed Sep 21 2022 Panu Matilainen - 4.18.0-1 - Rebase to rpm 4.18.0 (https://rpm.org/wiki/Releases/4.18.0)