From a5d02b84eb80b8d8f1a14f20e942af56e2755cee Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 16 Oct 2023 13:22:35 -0400 Subject: [PATCH] Fixes for -WError=implicit-function-declaration on RHEL Reinstates the dump headers without compiling the implementations Signed-off-by: Stephen Gallagher --- dump-replacement.patch | 8 -------- dump.spec | 10 +++++++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dump-replacement.patch b/dump-replacement.patch index 58d3611..659dd4c 100644 --- a/dump-replacement.patch +++ b/dump-replacement.patch @@ -1,14 +1,6 @@ diff -urNp a/common/dumprmt.c b/common/dumprmt.c --- a/common/dumprmt.c 2021-02-08 13:23:33.366826516 +0100 +++ b/common/dumprmt.c 2021-02-08 13:26:13.725243819 +0100 -@@ -83,7 +83,6 @@ - #endif - - #include --#include "dump.h" /* for X_STARTUP, X_ABORT etc */ - - #define TS_CLOSED 0 - #define TS_OPEN 1 @@ -150,7 +149,7 @@ rmtconnaborted(UNUSED(int signo)) } } diff --git a/dump.spec b/dump.spec index 2981222..753d8d5 100644 --- a/dump.spec +++ b/dump.spec @@ -12,7 +12,7 @@ Name: dump %endif Epoch: 1 Version: 0.4 -Release: 0.53.%{PREVER}%{?dist} +Release: 0.54.%{PREVER}%{?dist} License: BSD-3-Clause URL: https://sourceforge.net/projects/dump/ Source: http://downloads.sourceforge.net/dump/dump-%{DUMP_VERSION}.tar.gz @@ -34,10 +34,10 @@ Patch0: dump-buildfix.patch Patch1: dump-remove-lzo.patch Patch2: dump-apath.patch -%if 0%{?rhel} # No dump package in RHEL (restore remains) Patch101: dump-replacement.patch +%if 0%{?rhel} %description The restore command performs the inverse function of dump; it can restore a full backup of a filesystem. Subsequent incremental backups @@ -68,7 +68,7 @@ restoring filesystems after backups. %patch 2 -p1 -b .apath %if 0%{?rhel} -rm -rf dump +rm -rf dump/*.c %patch 101 -p1 %endif @@ -131,6 +131,10 @@ popd %{_mandir}/man8/rrestore.8* %changelog +* Mon Oct 16 2023 Stephen Gallagher - 1:0.4-0.54.b47 +- Fixes for -WError=implicit-function-declaration on RHEL +- Reinstates the dump headers without compiling the implementations + * Wed Jul 19 2023 Fedora Release Engineering - 1:0.4-0.53.b47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild