From 8d012e162931483aacdfae79f7a1c7142e30f992 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 13 Jun 2017 09:48:40 -0600 Subject: [PATCH 01/28] Rebuild for protobuf 3.3.1 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index efd9fdb..7ce113a 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -74,6 +74,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Tue Jun 13 2017 Orion Poplawski - 1.4.4-6 +- Rebuild for protobuf 3.3.1 + * Sat Feb 11 2017 Fedora Release Engineering - 1.4.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 78a6b6381bca3d409ee5bde382268d4de26ca40e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:40:59 +0000 Subject: [PATCH 02/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 7ce113a..660e61c 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -74,6 +74,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jun 13 2017 Orion Poplawski - 1.4.4-6 - Rebuild for protobuf 3.3.1 From cb6d460e68e4a6dc971500f93785271456e91691 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:09:27 +0000 Subject: [PATCH 03/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 660e61c..ad2f6e0 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -74,6 +74,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 066348c3ebdcb537a6c4e1485113d6593fa7f082 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 13 Nov 2017 23:27:42 +0100 Subject: [PATCH 04/28] Rebuild for protobuf 3.4 Signed-off-by: Igor Gnatenko --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index ad2f6e0..fb4426e 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -74,6 +74,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Mon Nov 13 2017 Igor Gnatenko - 1.4.4-9 +- Rebuild for protobuf 3.4 + * Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 91a0d9c437d560982e7f42e19561b7e921817df2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 29 Nov 2017 12:14:52 +0100 Subject: [PATCH 05/28] Rebuild for protobuf 3.5 Signed-off-by: Igor Gnatenko --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index fb4426e..9bdb512 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -74,6 +74,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Wed Nov 29 2017 Igor Gnatenko - 1.4.4-10 +- Rebuild for protobuf 3.5 + * Mon Nov 13 2017 Igor Gnatenko - 1.4.4-9 - Rebuild for protobuf 3.4 From 6b786d58fd89c983e244b501145db93ddfc90fcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 22:25:01 +0000 Subject: [PATCH 06/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 9bdb512..74b7029 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -74,6 +74,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.4.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Nov 29 2017 Igor Gnatenko - 1.4.4-10 - Rebuild for protobuf 3.5 From 2512a449e386713529037d0c13f47ffd29f1e4b7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 07/28] add BuildRequires: gcc-c++,gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- zbackup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zbackup.spec b/zbackup.spec index 74b7029..0f2b62f 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -16,6 +16,8 @@ License: GPLv2+ with exceptions URL: http://zbackup.org/ Source0: https://github.com/zbackup/zbackup/archive/%{version}.tar.gz +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: %{cmake_pkg} >= 2.8.2 BuildRequires: xz-devel BuildRequires: openssl-devel From 60cc96326057c6366ffe0801e14f02a4af09c94f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:48:29 +0000 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 0f2b62f..e0ca1c6 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.4.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 1.4.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9a566656da7defdff9212355f79e7c7fedb04fea Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 21 Nov 2018 17:16:20 +0100 Subject: [PATCH 09/28] Rebuild for protobuf 3.6 Signed-off-by: Igor Gnatenko --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index e0ca1c6..7721219 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Wed Nov 21 2018 Igor Gnatenko - 1.4.4-13 +- Rebuild for protobuf 3.6 + * Sat Jul 14 2018 Fedora Release Engineering - 1.4.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9d4197e60a3bdffca8208258b4f0d9603cedd7d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:08:30 +0000 Subject: [PATCH 10/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 7721219..d39b1ea 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.4.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Wed Nov 21 2018 Igor Gnatenko - 1.4.4-13 - Rebuild for protobuf 3.6 From e36c7ca0e5447fe49a5cf62d94d916b39dbde0a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:57:12 +0000 Subject: [PATCH 11/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index d39b1ea..31573e4 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.4.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.4.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 2f9ee2a0efb04181af9acf25a8e6942886b7837c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 18 Dec 2019 20:42:34 -0700 Subject: [PATCH 12/28] Rebuild for protobuf 3.11 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 31573e4..079958d 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Thu Dec 19 2019 Orion Poplawski - 1.4.4-16 +- Rebuild for protobuf 3.11 + * Sat Jul 27 2019 Fedora Release Engineering - 1.4.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a7c5ecba1cbb366f2a67a9276d9655e4675b05fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:15:42 +0000 Subject: [PATCH 13/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 079958d..5c4ffb6 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.4.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 19 2019 Orion Poplawski - 1.4.4-16 - Rebuild for protobuf 3.11 From f5ba3203bfc870c5b21311d503b9545b27da491e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 22 Jun 2020 07:43:14 +0200 Subject: [PATCH 14/28] Rebuilt for protobuf 3.12 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 5c4ffb6..1530c96 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -9,7 +9,7 @@ Name: zbackup Version: 1.4.4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -76,6 +76,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %endif %changelog +* Sun Jun 14 2020 Adrian Reber - 1.4.4-18 +- Rebuilt for protobuf 3.12 + * Fri Jan 31 2020 Fedora Release Engineering - 1.4.4-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f05f3f926656ba8dc766a4e484c29c015980f37f Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Sun, 5 Jul 2020 19:44:10 +0200 Subject: [PATCH 15/28] Improve compatibility with new CMake macro Signed-off-by: Igor Raits --- zbackup.spec | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/zbackup.spec b/zbackup.spec index 1530c96..4084f22 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -1,11 +1,4 @@ -%global _hardened_build 1 -%global cmake_pkg cmake -%if 0%{?rhel} -%if 0%{?rhel} < 7 -%global cmake_pkg cmake28 -%global legacy_el 1 -%endif -%endif +%undefine __cmake_in_source_build Name: zbackup Version: 1.4.4 @@ -18,7 +11,7 @@ Source0: https://github.com/zbackup/zbackup/archive/%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: %{cmake_pkg} >= 2.8.2 +BuildRequires: cmake >= 2.8.2 BuildRequires: xz-devel BuildRequires: openssl-devel BuildRequires: protobuf-devel @@ -39,41 +32,26 @@ required is very low. %setup -q %build -mkdir -p objdir tartool/objdir -pushd objdir -%{?cmake28}%{!?cmake28:%{?cmake}} .. -make %{?_smp_mflags} -popd -pushd tartool/objdir -%{?cmake28}%{!?cmake28:%{?cmake}} .. -make %{?_smp_mflags} -popd +%cmake +%cmake_build +cd tartool +%cmake +%cmake_build +cd - %install -%if 0%{?legacy_el} -rm -rf %{buildroot} -%endif -make install -C objdir DESTDIR=%{buildroot} -install tartool/objdir/tartool %{buildroot}%{_bindir}/ -%if 0%{?legacy_el} -grep -v travis README.md | pandoc -s -f markdown -t man -o %{name}.1 \ --V title=%{name} -V section=1 -V date="$(LANG=C date -d @$(stat -c'%Z' README.md) +'%B %d, %Y')" -%else +%cmake_install +install -Dpm0755 tartool/%{_vpath_builddir}/tartool %{buildroot}%{_bindir}/ grep -v travis README.md | pandoc -s -f markdown_github -t man -o %{name}.1 \ -V title=%{name} -V section=1 -V date="$(LANG=C date -d @$(stat -c'%Z' README.md) +'%B %d, %Y')" -%endif -install -D -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +install -D -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %files -%{_bindir}/* -%{_mandir}/man1/*.1.* -%if 0%{?legacy_el} -%doc LICENSE LICENSE-GPL* CONTRIBUTORS -%else %license LICENSE LICENSE-GPL* %doc CONTRIBUTORS -%endif +%{_bindir}/* +%{_mandir}/man1/*.1* %changelog * Sun Jun 14 2020 Adrian Reber - 1.4.4-18 From a4cbb15403d0ed03910c2af41d404676d02226e6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:20:25 +0000 Subject: [PATCH 16/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 4084f22..988a599 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -54,6 +54,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sun Jun 14 2020 Adrian Reber - 1.4.4-18 - Rebuilt for protobuf 3.12 From 5925a0dcb55689b253f718ba3826b6a725861225 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Wed, 29 Jul 2020 10:43:32 -0600 Subject: [PATCH 17/28] Force C++14 as this code is not yet C++17 ready --- zbackup.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 988a599..0b81276 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -32,6 +32,7 @@ required is very low. %setup -q %build +export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" %cmake %cmake_build cd tartool @@ -54,6 +55,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.4.4-20 +- Force C++14 as this code is not yet C++17 ready + * Wed Jul 29 2020 Fedora Release Engineering - 1.4.4-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6f6e0834db20ee279a282f0fca57852012bf5973 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 24 Sep 2020 17:00:02 +0200 Subject: [PATCH 18/28] Rebuilt for protobuf 3.13 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 0b81276..dd7c962 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -55,6 +55,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Thu Sep 24 2020 Adrian Reber - 1.4.4-21 +- Rebuilt for protobuf 3.13 + * Wed Jul 29 2020 Fedora Release Engineering - 1.4.4-20 - Force C++14 as this code is not yet C++17 ready From 65d07c468eb5e1cd3e3b0052d176c0362c910f6d Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 13 Jan 2021 14:44:25 +0100 Subject: [PATCH 19/28] Rebuilt for protobuf 3.14 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index dd7c962..f7ee327 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -55,6 +55,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Wed Jan 13 14:44:23 CET 2021 Adrian Reber - 1.4.4-22 +- Rebuilt for protobuf 3.14 + * Thu Sep 24 2020 Adrian Reber - 1.4.4-21 - Rebuilt for protobuf 3.13 From c1d9863da69de5e02b5b65cd9ddf5450e48ffe50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:39:28 +0000 Subject: [PATCH 20/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index f7ee327..5b634f7 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -55,6 +55,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.4.4-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 14:44:23 CET 2021 Adrian Reber - 1.4.4-22 - Rebuilt for protobuf 3.14 From 26179d0d9582eb858b1fc9d20b97addd4ec5ecd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:15:06 +0000 Subject: [PATCH 21/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 5b634f7..110a7d1 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -55,6 +55,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.4-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Fedora Release Engineering - 1.4.4-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b4fe3521d4e0241080bb6e2e648a01302be62cb5 Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:18:35 +0200 Subject: [PATCH 22/28] Rebuilt with OpenSSL 3.0.0 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 110a7d1..7087ed6 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -55,6 +55,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Tue Sep 14 2021 Sahana Prasad - 1.4.4-25 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.4.4-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 13d60f7a05d3d34c1c76768ad11bba23c10b19fa Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 23 Oct 2021 13:10:08 +0200 Subject: [PATCH 23/28] Rebuilt for protobuf 3.18.1 --- 159.patch | 22 ++++++++++++++++++++++ zbackup.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 159.patch diff --git a/159.patch b/159.patch new file mode 100644 index 0000000..e7dbd19 --- /dev/null +++ b/159.patch @@ -0,0 +1,22 @@ +From b4ca95ac42ad5e0b491dc87d40f51c297b3a2eca Mon Sep 17 00:00:00 2001 +From: Nipunn Koorapati +Date: Sat, 2 Oct 2021 11:49:18 -0700 +Subject: [PATCH] Backport #158 - use one param when calling SetTotalBytesLimit + +--- + backup_restorer.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backup_restorer.cc b/backup_restorer.cc +index 3b83cd0..a4ab2d5 100644 +--- a/backup_restorer.cc ++++ b/backup_restorer.cc +@@ -27,7 +27,7 @@ void restore( ChunkStorage::Reader & chunkStorageReader, + // TODO: this disables size checks for each separate message. Figure a better + // way to do this while keeping them enabled. It seems we need to create an + // instance of CodedInputStream for each message, but it might be expensive +- cis.SetTotalBytesLimit( backupData.size(), -1 ); ++ cis.SetTotalBytesLimit( backupData.size() ); + + // Used when emitting chunks + string chunk; diff --git a/zbackup.spec b/zbackup.spec index 7087ed6..e2f2d5e 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,12 +2,13 @@ Name: zbackup Version: 1.4.4 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions URL: http://zbackup.org/ Source0: https://github.com/zbackup/zbackup/archive/%{version}.tar.gz +Patch0: https://patch-diff.githubusercontent.com/raw/zbackup/zbackup/pull/159.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -30,6 +31,7 @@ required is very low. %prep %setup -q +%patch0 -p1 %build export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" @@ -55,6 +57,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Sat Oct 23 2021 Adrian Reber - 1.4.4-26 +- Rebuilt for protobuf 3.18.1 + * Tue Sep 14 2021 Sahana Prasad - 1.4.4-25 - Rebuilt with OpenSSL 3.0.0 From 231f9f6b8b7e0af315a14f40fc27ffa97104b302 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Sat, 6 Nov 2021 13:04:03 +0100 Subject: [PATCH 24/28] Rebuilt for protobuf 3.19.0 --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index e2f2d5e..91f8b6a 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -57,6 +57,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Sat Nov 06 2021 Adrian Reber - 1.4.4-27 +- Rebuilt for protobuf 3.19.0 + * Sat Oct 23 2021 Adrian Reber - 1.4.4-26 - Rebuilt for protobuf 3.18.1 From 90b8158a6a58fc13bf9e4191109041b53663bcff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:48:44 +0000 Subject: [PATCH 25/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index 91f8b6a..e46c91e 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 27%{?dist} +Release: 28%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -57,6 +57,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.4.4-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Nov 06 2021 Adrian Reber - 1.4.4-27 - Rebuilt for protobuf 3.19.0 From be13a1fd48a844ef179dbaa93c67bd2e0f9119a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:52:02 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index e46c91e..a686321 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -57,6 +57,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.4.4-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.4.4-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From c9de4528cc381a58f49700f78bca4748bb07de31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:12:37 +0000 Subject: [PATCH 27/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zbackup.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zbackup.spec b/zbackup.spec index a686321..9324afd 100644 --- a/zbackup.spec +++ b/zbackup.spec @@ -2,7 +2,7 @@ Name: zbackup Version: 1.4.4 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A versatile deduplicating backup tool License: GPLv2+ with exceptions @@ -57,6 +57,9 @@ ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 %{_mandir}/man1/*.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.4.4-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.4.4-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9eb8acc762a7e772638e80e2d54e278183ed69fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 7 Jun 2023 00:33:42 +0200 Subject: [PATCH 28/28] Orphaned for 6+ weeks --- .gitignore | 5 -- 159.patch | 22 ------- dead.package | 1 + sources | 1 - zbackup.spec | 177 --------------------------------------------------- 5 files changed, 1 insertion(+), 205 deletions(-) delete mode 100644 .gitignore delete mode 100644 159.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 zbackup.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bb39631..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/1.3.tar.gz -/1.4.1.tar.gz -/1.4.2.tar.gz -/1.4.3.tar.gz -/1.4.4.tar.gz diff --git a/159.patch b/159.patch deleted file mode 100644 index e7dbd19..0000000 --- a/159.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b4ca95ac42ad5e0b491dc87d40f51c297b3a2eca Mon Sep 17 00:00:00 2001 -From: Nipunn Koorapati -Date: Sat, 2 Oct 2021 11:49:18 -0700 -Subject: [PATCH] Backport #158 - use one param when calling SetTotalBytesLimit - ---- - backup_restorer.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/backup_restorer.cc b/backup_restorer.cc -index 3b83cd0..a4ab2d5 100644 ---- a/backup_restorer.cc -+++ b/backup_restorer.cc -@@ -27,7 +27,7 @@ void restore( ChunkStorage::Reader & chunkStorageReader, - // TODO: this disables size checks for each separate message. Figure a better - // way to do this while keeping them enabled. It seems we need to create an - // instance of CodedInputStream for each message, but it might be expensive -- cis.SetTotalBytesLimit( backupData.size(), -1 ); -+ cis.SetTotalBytesLimit( backupData.size() ); - - // Used when emitting chunks - string chunk; diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index a60ab7d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -0753ca5d61533f951d6ebb6f087efa0b 1.4.4.tar.gz diff --git a/zbackup.spec b/zbackup.spec deleted file mode 100644 index 9324afd..0000000 --- a/zbackup.spec +++ /dev/null @@ -1,177 +0,0 @@ -%undefine __cmake_in_source_build - -Name: zbackup -Version: 1.4.4 -Release: 30%{?dist} -Summary: A versatile deduplicating backup tool - -License: GPLv2+ with exceptions -URL: http://zbackup.org/ -Source0: https://github.com/zbackup/zbackup/archive/%{version}.tar.gz -Patch0: https://patch-diff.githubusercontent.com/raw/zbackup/zbackup/pull/159.patch - -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: cmake >= 2.8.2 -BuildRequires: xz-devel -BuildRequires: openssl-devel -BuildRequires: protobuf-devel -BuildRequires: zlib-devel -BuildRequires: lzo-devel -BuildRequires: pandoc - -%description -zbackup is a globally-deduplicating backup tool, based on the ideas -found in rsync. Feed a large .tar into it, and it will store duplicate -regions of it only once, then compress and optionally encrypt the -result. Feed another .tar file, and it will also re-use any data found -in any previous backups. This way only new changes are stored, and as -long as the files are not very different, the amount of storage -required is very low. - -%prep -%setup -q -%patch0 -p1 - -%build -export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS" -%cmake -%cmake_build -cd tartool -%cmake -%cmake_build -cd - - -%install -%cmake_install -install -Dpm0755 tartool/%{_vpath_builddir}/tartool %{buildroot}%{_bindir}/ -grep -v travis README.md | pandoc -s -f markdown_github -t man -o %{name}.1 \ --V title=%{name} -V section=1 -V date="$(LANG=C date -d @$(stat -c'%Z' README.md) +'%B %d, %Y')" -install -D -p -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 -ln -s %{name}.1 %{buildroot}%{_mandir}/man1/tartool.1 - -%files -%license LICENSE LICENSE-GPL* -%doc CONTRIBUTORS -%{_bindir}/* -%{_mandir}/man1/*.1* - -%changelog -* Sat Jan 21 2023 Fedora Release Engineering - 1.4.4-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.4.4-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.4.4-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Nov 06 2021 Adrian Reber - 1.4.4-27 -- Rebuilt for protobuf 3.19.0 - -* Sat Oct 23 2021 Adrian Reber - 1.4.4-26 -- Rebuilt for protobuf 3.18.1 - -* Tue Sep 14 2021 Sahana Prasad - 1.4.4-25 -- Rebuilt with OpenSSL 3.0.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 1.4.4-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 1.4.4-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 13 14:44:23 CET 2021 Adrian Reber - 1.4.4-22 -- Rebuilt for protobuf 3.14 - -* Thu Sep 24 2020 Adrian Reber - 1.4.4-21 -- Rebuilt for protobuf 3.13 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.4.4-20 -- Force C++14 as this code is not yet C++17 ready - -* Wed Jul 29 2020 Fedora Release Engineering - 1.4.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun Jun 14 2020 Adrian Reber - 1.4.4-18 -- Rebuilt for protobuf 3.12 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.4.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Dec 19 2019 Orion Poplawski - 1.4.4-16 -- Rebuild for protobuf 3.11 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.4.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.4.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 21 2018 Igor Gnatenko - 1.4.4-13 -- Rebuild for protobuf 3.6 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.4.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.4.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Nov 29 2017 Igor Gnatenko - 1.4.4-10 -- Rebuild for protobuf 3.5 - -* Mon Nov 13 2017 Igor Gnatenko - 1.4.4-9 -- Rebuild for protobuf 3.4 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.4.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 13 2017 Orion Poplawski - 1.4.4-6 -- Rebuild for protobuf 3.3.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 1.4.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 26 2017 Orion Poplawski - 1.4.4-4 -- Rebuild for protobuf 3.2.0 - -* Sat Nov 19 2016 Orion Poplawski - 1.4.4-3 -- Rebuild for protobuf 3.1.0 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Sep 21 2015 Vladimir Stackov - 1.4.4-1 -- Version bumped to 1.4.4 - -* Wed Aug 19 2015 Vladimir Stackov - 1.4.3-1 -- Version bumped to 1.4.3 - -* Fri Jul 31 2015 Vladimir Stackov - 1.4.2-1 -- Version bumped to 1.4.2 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Apr 23 2015 Mikolaj Izdebski - 1.4.1-2 -- Rebuild for protobuf soname bump - -* Wed Jan 07 2015 Vladimir Stackov - 1.4.1-1 -- Version bumped to 1.4.1 -- Added macroses for EL6 - -* Fri Dec 19 2014 Vladimir Stackov - 1.3-4 -- Modified in appliance with rhbz#1172525 - -* Fri Dec 12 2014 Vladimir Stackov - 1.3-3 -- Produce hardened binaries - -* Thu Dec 11 2014 Vladimir Stackov - 1.3-2 -- Modified in appliance with rhbz#1172525 -- Added tartool - -* Wed Dec 10 2014 Vladimir Stackov - 1.3-1 -- Initial version of the package