Hello community, here is the log from the commit of package extundelete for openSUSE:Factory checked in at 2018-06-04 13:22:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/extundelete (Old) and /work/SRC/openSUSE:Factory/.extundelete.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extundelete" Mon Jun 4 13:22:18 2018 rev:2 rq:613792 version:0.2.4 Changes: -------- --- /work/SRC/openSUSE:Factory/extundelete/extundelete.changes 2016-05-12 09:33:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.extundelete.new/extundelete.changes 2018-06-04 13:23:06.387354150 +0200 @@ -1,0 +2,5 @@ +Fri Jun 1 19:13:41 UTC 2018 - [email protected] + +- Added a patch (fix_ftbfs.patch) to fix FTBFS with new e2fsprogs. + +------------------------------------------------------------------- New: ---- fix_ftbfs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ extundelete.spec ++++++ --- /var/tmp/diff_new_pack.TrFLun/_old 2018-06-04 13:23:07.167325589 +0200 +++ /var/tmp/diff_new_pack.TrFLun/_new 2018-06-04 13:23:07.171325442 +0200 @@ -1,7 +1,7 @@ # # spec file for package extundelete # -# Copyright (c) 2016 SUSE LINUX 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 @@ -20,16 +20,17 @@ Version: 0.2.4 Release: 0 Summary: Recovery tool for ext4 and ext3 filesystems -License: GPL-2.0 +License: GPL-2.0-only Group: System/Filesystems -Url: http://extundelete.sourceforge.net/ +URL: http://extundelete.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM fix_ftbfs.patch [email protected] -- Fix FTBFS with new e2fsprogs (patch taken from Debian) +Patch0: fix_ftbfs.patch # Kept for compatibility reasons BuildRequires: e2fsprogs-devel BuildRequires: gcc-c++ BuildRequires: libext2fs-devel BuildRequires: libstdc++-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description extundelete is a utility that can recover deleted files from an ext3 or ext4 @@ -41,6 +42,7 @@ %prep %setup -q +%patch0 -p1 %build # Be verbose @@ -51,11 +53,11 @@ make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +%make_install %files -%defattr(-,root,root,-) -%doc LICENSE README +%license LICENSE +%doc README %{_bindir}/extundelete %changelog ++++++ fix_ftbfs.patch ++++++ Index: extundelete/src/insertionops.cc =================================================================== --- extundelete.orig/src/insertionops.cc +++ extundelete/src/insertionops.cc @@ -33,7 +33,7 @@ std::ostream& operator<<(std::ostream& o os << "File flags: " << inode.i_flags << std::endl; os << "File version (for NFS): " << inode.i_generation << std::endl; os << "File ACL: " << inode.i_file_acl << std::endl; - os << "Directory ACL: " << inode.i_dir_acl << std::endl; + os << "Directory ACL: " << inode.i_size_high << std::endl; os << "Fragment address: " << inode.i_faddr << std::endl; os << "Direct blocks: "; for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)
