Compare commits

...

No commits in common. 'cs10' and 'c9' have entirely different histories.
cs10 ... c9

@ -1,6 +1,14 @@
diff -urNp a/common/dumprmt.c b/common/dumprmt.c diff -urNp a/common/dumprmt.c b/common/dumprmt.c
--- a/common/dumprmt.c 2021-02-08 13:23:33.366826516 +0100 --- a/common/dumprmt.c 2021-02-08 13:23:33.366826516 +0100
+++ b/common/dumprmt.c 2021-02-08 13:26:13.725243819 +0100 +++ b/common/dumprmt.c 2021-02-08 13:26:13.725243819 +0100
@@ -83,7 +83,6 @@
#endif
#include <pathnames.h>
-#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)) @@ -150,7 +149,7 @@ rmtconnaborted(UNUSED(int signo))
} }
} }

@ -12,8 +12,8 @@ Name: dump
%endif %endif
Epoch: 1 Epoch: 1
Version: 0.4 Version: 0.4
Release: 0.59.%{PREVER}%{?dist} Release: 0.51.%{PREVER}%{?dist}
License: BSD-3-Clause License: BSD
URL: https://sourceforge.net/projects/dump/ URL: https://sourceforge.net/projects/dump/
Source: http://downloads.sourceforge.net/dump/dump-%{DUMP_VERSION}.tar.gz Source: http://downloads.sourceforge.net/dump/dump-%{DUMP_VERSION}.tar.gz
BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2
@ -34,10 +34,10 @@ Patch0: dump-buildfix.patch
Patch1: dump-remove-lzo.patch Patch1: dump-remove-lzo.patch
Patch2: dump-apath.patch Patch2: dump-apath.patch
%if 0%{?rhel}
# No dump package in RHEL (restore remains) # No dump package in RHEL (restore remains)
Patch101: dump-replacement.patch Patch101: dump-replacement.patch
%if 0%{?rhel}
%description %description
The restore command performs the inverse function of dump; it can The restore command performs the inverse function of dump; it can
restore a full backup of a filesystem. Subsequent incremental backups restore a full backup of a filesystem. Subsequent incremental backups
@ -63,13 +63,13 @@ restoring filesystems after backups.
%prep %prep
%setup -q -n dump-%{DUMP_VERSION} %setup -q -n dump-%{DUMP_VERSION}
%patch 0 -p1 -b .buildfix %patch0 -p1 -b .buildfix
%patch 1 -p1 -b .remove-lzo %patch1 -p1 -b .remove-lzo
%patch 2 -p1 -b .apath %patch2 -p1 -b .apath
%if 0%{?rhel} %if 0%{?rhel}
rm -rf dump/*.c rm -rf dump
%patch 101 -p1 %patch101 -p1
%endif %endif
%build %build
@ -131,43 +131,11 @@ popd
%{_mandir}/man8/rrestore.8* %{_mandir}/man8/rrestore.8*
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.4-0.59.b47 * Tue Aug 17 2021 Josef Ridky <jridky@redhat.com> - 1:0.4-0.51.b47
- Bump release for October 2024 mass rebuild: - rename spec file to restore
Resolves: RHEL-64018 - add gating.yaml
- changes between .47 and .51 had to be stripped due of wrong sync
* Wed Jun 26 2024 Josef Ridky <jridky@redhat.com> - 1:0.4-0.58.b47 between centos and dist-git
- Add gating.yaml file
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:0.4-0.57.b47
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.56.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.55.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Oct 16 2023 Stephen Gallagher <sgallagh@redhat.com> - 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 <releng@fedoraproject.org> - 1:0.4-0.53.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue May 02 2023 Josef Ridky <jridky@redhat.com> - 1:0.4-0.52.b47
- move to SPDX license format
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.51.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.50.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.49.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.4-0.48.b47
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Feb 10 2021 Josef Ridky <jridky@redhat.com> - 1:0.4-0.47.b47 * Wed Feb 10 2021 Josef Ridky <jridky@redhat.com> - 1:0.4-0.47.b47
- remove dump from RHEL environment - remove dump from RHEL environment
Loading…
Cancel
Save