Hello community, here is the log from the commit of package ext3grep for openSUSE:Factory checked in at 2018-12-06 12:16:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ext3grep (Old) and /work/SRC/openSUSE:Factory/.ext3grep.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ext3grep" Thu Dec 6 12:16:35 2018 rev:6 rq:652666 version:0.10.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ext3grep/ext3grep.changes 2012-10-04 19:38:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ext3grep.new.19453/ext3grep.changes 2018-12-06 12:16:37.305564591 +0100 @@ -1,0 +2,7 @@ +Tue Nov 13 06:34:20 UTC 2018 - [email protected] + +- Add ext3grep-0.10.2-rename-i_dir_acl.patch: Fix build + (boo#1115054). +- Clean spec file. + +------------------------------------------------------------------- New: ---- ext3grep-0.10.2-rename-i_dir_acl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ext3grep.spec ++++++ --- /var/tmp/diff_new_pack.96S0GD/_old 2018-12-06 12:16:37.769564092 +0100 +++ /var/tmp/diff_new_pack.96S0GD/_new 2018-12-06 12:16:37.769564092 +0100 @@ -1,7 +1,7 @@ # # spec file for package ext3grep # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,23 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: ext3grep Version: 0.10.2 -Release: 1.0 +Release: 0 Summary: A tool to possibly recover deleted content on ext3 file systems -License: GPL-2.0 -Group: Productivity/File utilities -Url: http://code.google.com/p/ext3grep/ +License: GPL-2.0-only +Group: System/Filesystems +URL: http://code.google.com/p/ext3grep/ Source: %{name}-%{version}.tar.bz2 Source1: Readme.SuSE -Patch1: e2fsprogs-1.42.patch +Patch0: e2fsprogs-1.42.patch +# PATCH-FIX-UPSTREAM ext3grep-0.10.2-rename-i_dir_acl.patch -- Fix FTBFS (boo#1115054) +Patch1: ext3grep-0.10.2-rename-i_dir_acl.patch BuildRequires: gcc-c++ BuildRequires: libext2fs-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: ppc ppc64 s390 s390x %description @@ -37,8 +38,7 @@ Also see http://www.xs4all.nl/~carlo17/howto/undelete_ext3.html %prep -%setup -q -%patch1 -p1 +%autosetup -p1 cp %{SOURCE1} . %build @@ -46,14 +46,14 @@ make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install -make install DESTDIR="%buildroot" +%make_install %files -%defattr(-,root,root) %doc NEWS README Readme.SuSE +%license LICENSE.GPL2 %{_bindir}/ext3grep %changelog ++++++ ext3grep-0.10.2-rename-i_dir_acl.patch ++++++ Description: fix a FTBFS with e2fsprogs 1.44.1-1. (Closes: #894650) Author: Hilko Bengen <[email protected]> Bug-Debian: https://bugs.debian.org/894650 Last-Update: 2018-04-13 Index: ext3grep/src/ext3.h =================================================================== --- ext3grep.orig/src/ext3.h +++ ext3grep/src/ext3.h @@ -117,7 +117,7 @@ struct Inode : protected ext3_inode { __u32 const* block(void) const { return i_block; } __u32 generation(void) const { return i_generation; } __u32 file_acl(void) const { return i_file_acl; } - __u32 dir_acl(void) const { return i_dir_acl; } + __u32 size_high(void) const { return i_size_high; } __u32 faddr(void) const { return i_faddr; } __u16 uid_high(void) const { return i_uid_high; } __u16 gid_high(void) const { return i_gid_high; }
