Hello community, here is the log from the commit of package ext4magic for openSUSE:Factory checked in at 2018-11-15 12:39:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ext4magic (Old) and /work/SRC/openSUSE:Factory/.ext4magic.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ext4magic" Thu Nov 15 12:39:41 2018 rev:9 rq:648852 version:0.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ext4magic/ext4magic.changes 2014-09-17 17:27:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ext4magic.new/ext4magic.changes 2018-11-15 12:39:47.170295259 +0100 @@ -1,0 +2,7 @@ +Mon Nov 12 19:22:16 UTC 2018 - [email protected] + +- Add ext4magic-0.3.2-rename-i_dir_acl.patch: Fix build + (boo#1115053). +- Clean spec file. + +------------------------------------------------------------------- New: ---- ext4magic-0.3.2-rename-i_dir_acl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ext4magic.spec ++++++ --- /var/tmp/diff_new_pack.eTpFSO/_old 2018-11-15 12:39:48.018294359 +0100 +++ /var/tmp/diff_new_pack.eTpFSO/_new 2018-11-15 12:39:48.034294342 +0100 @@ -1,7 +1,7 @@ # # spec file for package ext4magic # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 [email protected] # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # 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/ # @@ -21,11 +21,13 @@ Version: 0.3.2 Release: 0 Summary: Can help to recover deleted files on ext3/4 filesystems -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/Filesystems -Url: http://sourceforge.net/projects/ext4magic/ +URL: http://sourceforge.net/projects/ext4magic/ #Doc_Url: http://ext4magic.sourceforge.net/ext4magic_en.html -Source0: http://sourceforge.net/projects/ext4magic/files/ext4magic-0.3.2.tar.gz +Source0: http://sourceforge.net/projects/ext4magic/files/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM ext4magic-0.3.2-rename-i_dir_acl.patch -- Fix FTBFS (boo#1115053) +Patch0: ext4magic-0.3.2-rename-i_dir_acl.patch BuildRequires: file-devel > 5.05 BuildRequires: libblkid-devel BuildRequires: libbz2-devel @@ -43,8 +45,6 @@ BuildRequires: libext2fs-devel >= 1.42.6 %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %description ext4magic is a small tool for Linux administration, it can help to recover accidentally deleted or overwritten files from an ext3 or ext4 file systems. @@ -54,7 +54,7 @@ the deleted files back? %prep -%setup -q +%autosetup -p1 %build %configure \ @@ -63,12 +63,12 @@ make %{?_smp_mflags} %install -%{makeinstall} +%make_install %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README TODO +%doc AUTHORS ChangeLog NEWS README TODO +%license COPYING %{_sbindir}/ext4magic -%{_mandir}/man8/ext4magic.8.gz +%{_mandir}/man8/ext4magic.8%{?ext_man} %changelog ++++++ ext4magic-0.3.2-rename-i_dir_acl.patch ++++++ Description: Fix FTBFS with new e2fsprogs. Author: Hilko Bengen <[email protected]> Last-Update: 2018-04-13 Index: ext4magic/src/inode.c =================================================================== --- ext4magic.orig/src/inode.c +++ ext4magic/src/inode.c @@ -406,14 +406,14 @@ void dump_inode(FILE *out, const char *p fprintf(out, "%sFile ACL: %d Directory ACL: %d Translator: %d\n", prefix, - inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0, + inode->i_file_acl, LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0, inode->osd1.hurd1.h_i_translator); else fprintf(out, "%sFile ACL: %llu Directory ACL: %d\n", prefix, inode->i_file_acl | ((long long) (inode->osd2.linux2.l_i_file_acl_high) << 32), - LINUX_S_ISDIR(inode->i_mode) ? inode->i_dir_acl : 0); + LINUX_S_ISDIR(inode->i_mode) ? inode->i_size_high : 0); if (os == EXT2_OS_LINUX) fprintf(out, "%sLinks: %d Blockcount: %llu\n", prefix, inode->i_links_count,
