PR#2: Rebase to 0.8.2 (RH#1669128) to fix FTBFS (RH#1676010) - rpms/snapper

Neal Gompa • 5 years ago

e4840d2

.gitignore

file modified

file added

+42

		`@@ -0,0 +1,42 @@`
		`+ From 13dce68b20af1b2c6bb7898ba0ce74d323bccc16 Mon Sep 17 00:00:00 2001`
		`+ From: Neal Gompa <ngompa13@gmail.com>`
		`+ Date: Mon, 18 Feb 2019 22:34:17 -0500`
		`+ Subject: [PATCH] Revert "- removed unused variable"`
		`+`
		`+ The variable previously removed is actually used when SELinux is`
		`+ enabled.`
		`+`
		`+ This reverts commit 842721cd470ce5b97316fff250b0c1fa356a00f4.`
		`+ ---`
		`+ snapper/Lvm.cc \| 2 +-`
		`+ snapper/Lvm.h \| 1 +`
		`+ 2 files changed, 2 insertions(+), 1 deletion(-)`
		`+`
		`+ diff --git a/snapper/Lvm.cc b/snapper/Lvm.cc`
		`+ index 5dd0621..a944800 100644`
		`+ --- a/snapper/Lvm.cc`
		`+ +++ b/snapper/Lvm.cc`
		`+ @@ -63,7 +63,7 @@ namespace snapper`
		`+ Lvm::Lvm(const string& subvolume, const string& root_prefix, const string& mount_type)`
		`+ : Filesystem(subvolume, root_prefix), mount_type(mount_type),`
		`+ caps(LvmCapabilities::get_lvm_capabilities()),`
		`+ - cache(LvmCache::get_lvm_cache())`
		`+ + cache(LvmCache::get_lvm_cache()), sh(NULL)`
		`+ {`
		`+ if (access(LVCREATEBIN, X_OK) != 0)`
		`+ {`
		`+ diff --git a/snapper/Lvm.h b/snapper/Lvm.h`
		`+ index 5aa3098..5f29dd9 100644`
		`+ --- a/snapper/Lvm.h`
		`+ +++ b/snapper/Lvm.h`
		`+ @@ -115,6 +115,7 @@ namespace snapper`
		`+ const string mount_type;`
		`+ const LvmCapabilities* caps;`
		`+ LvmCache* cache;`
		`+ + SelinuxLabelHandle* sh;`
		`+`
		`+ bool detectThinVolumeNames(const MtabData& mtab_data);`
		`+ void activateSnapshot(const string& vg_name, const string& lv_name) const;`
		`+ --`
		`+ 2.20.1`
		`+`

snapper.spec

file modified

+9 -3

		`@@ -1,6 +1,6 @@`
		`Name: snapper`
		`- Version: 0.5.6`
		`- Release: 2%{?dist}`
		`+ Version: 0.8.2`
		`+ Release: 1%{?dist}`
		`Summary: Tool for filesystem snapshot management`

		`License: GPLv2`
		`@@ -8,6 +8,8 @@`
		`Source0: https://github.com/openSUSE/snapper/archive/v%{version}/%{name}-%{version}.tar.gz`
		`Patch0: %{name}-remove-ext4-info-xml.patch`
		`Patch1: %{name}-securelibdir.patch`
		`+ # From: https://github.com/openSUSE/snapper/pull/475`
		`+ Patch2: %{name}-Revert-removed-unused-variable.patch`

		`BuildRequires: autoconf`
		`BuildRequires: automake`
		`@@ -16,6 +18,7 @@`
		`BuildRequires: gcc`
		`BuildRequires: gcc-c++`
		`BuildRequires: systemd`
		`+ BuildRequires: glibc-all-langpacks`

		`BuildRequires: boost-devel`
		`BuildRequires: dbus-devel`
		`@@ -79,7 +82,7 @@`
		`%install`
		`%make_install`
		`install -Dpm0644 data/sysconfig.snapper %{buildroot}%{_sysconfdir}/sysconfig/%{name}`
		`- %{find_lang} %{name}`
		`+ %find_lang %{name}`
		`find %{buildroot} -name '*.la' -print -delete`
		`rm -rf %{buildroot}%{_sysconfdir}/cron.hourly`
		`rm -rf %{buildroot}%{_sysconfdir}/cron.daily`
		`@@ -132,6 +135,9 @@`
		`%{_mandir}/man8/pam_snapper.8*`

		`%changelog`
		`+ * Mon Feb 18 2019 Neal Gompa <ngompa13@gmail.com> - 0.8.2-1`
		`+ - Rebase to 0.8.2 (RH#1669128) to fix FTBFS (RH#1676010)`
		`+`
		`* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.6-2`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (snapper-0.5.6.tar.gz) = 96cb4889dafc0462ed88e97142455e932eb89ab0640fcfcc2dc41270e5ab5124cd71586026b1db0e971dc0cb22ee74bf37b3b67fe9367e19dc5e1010a5878a34`
		`+ SHA512 (snapper-0.8.2.tar.gz) = 53e801e5e3c939a63833fab143c665e2289e128004dd67dcc98826b994d2150b268af021505b0f98982d66ea520a2d98279da15a904a003f2a0a1f1fac80124f`