From e8f08e3cf58da8553f8bfe99cbb47ad33e735bc8726fea74af03d52f0068b4de Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 16 Jul 2018 10:46:36 +0000 Subject: [PATCH 1/2] Accepting request 623099 from home:jubalh:branches:Archiving:Backup - Update to 0.8.5: * Improved support for extfs filesystems (Contribution from Marcos Mello) * Fixed build issue with e2fsprogs < 1.41 (Contribution from Marcos Mello) * Fixed build issue related to xattr.h (Contribution from Lars Wendler) - Remove fsarchiver-attr.patch: upstreamed OBS-URL: https://build.opensuse.org/request/show/623099 OBS-URL: https://build.opensuse.org/package/show/Archiving:Backup/fsarchiver?expand=0&rev=42 --- fsarchiver-0.8.4.tar.gz | 3 --- fsarchiver-0.8.5.tar.gz | 3 +++ fsarchiver-attr.patch | 57 ----------------------------------------- fsarchiver.changes | 9 +++++++ fsarchiver.spec | 8 +++--- 5 files changed, 16 insertions(+), 64 deletions(-) delete mode 100644 fsarchiver-0.8.4.tar.gz create mode 100644 fsarchiver-0.8.5.tar.gz delete mode 100644 fsarchiver-attr.patch diff --git a/fsarchiver-0.8.4.tar.gz b/fsarchiver-0.8.4.tar.gz deleted file mode 100644 index 159d415..0000000 --- a/fsarchiver-0.8.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72cbf31df756bfa6a3b9514cfe148f6af12c5ca861bca8d3755ffea6b856ff66 -size 298793 diff --git a/fsarchiver-0.8.5.tar.gz b/fsarchiver-0.8.5.tar.gz new file mode 100644 index 0000000..4ff5581 --- /dev/null +++ b/fsarchiver-0.8.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c694f52e42703d7e8c4d56f2db97a8ff5616df1d723429126de97c22217c88fe +size 298502 diff --git a/fsarchiver-attr.patch b/fsarchiver-attr.patch deleted file mode 100644 index 32d8d7f..0000000 --- a/fsarchiver-attr.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: fsarchiver-0.6.23/src/oper_restore.c -=================================================================== ---- fsarchiver-0.6.23.orig/src/oper_restore.c -+++ fsarchiver-0.6.23/src/oper_restore.c -@@ -19,12 +19,13 @@ - # include "config.h" - #endif - -+#include - #include - #include - #include - #include - #include --#include -+#include - #include - #include - #include -Index: fsarchiver-0.6.23/src/oper_save.c -=================================================================== ---- fsarchiver-0.6.23.orig/src/oper_save.c -+++ fsarchiver-0.6.23/src/oper_save.c -@@ -29,7 +29,8 @@ - #include - #include - #include --#include -+#include -+#include - #include - #include - #include -@@ -59,6 +60,10 @@ - #include "error.h" - #include "queue.h" - -+#ifndef ENOATTR -+#define ENOATTR ENODATA -+#endif -+ - typedef struct s_savear - { carchwriter ai; - cregmulti regmulti; -Index: fsarchiver-0.6.23/configure.ac -=================================================================== ---- fsarchiver-0.6.23.orig/configure.ac -+++ fsarchiver-0.6.23/configure.ac -@@ -88,7 +88,7 @@ PKG_CHECK_MODULES([BLKID], [blkid]) - PKG_CHECK_MODULES([UUID], [uuid]) - - dnl Check for header files installed with a library --AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([attr/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])]) -+AC_CHECK_HEADER([sys/xattr.h],, [AC_MSG_ERROR([sys/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])]) - - dnl Check for standard header files. - AC_CHECK_HEADERS([malloc.h unistd.h pthread.h]) diff --git a/fsarchiver.changes b/fsarchiver.changes index 73a626f..b300c9d 100644 --- a/fsarchiver.changes +++ b/fsarchiver.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 16 09:06:55 UTC 2018 - mvetter@suse.com + +- Update to 0.8.5: + * Improved support for extfs filesystems (Contribution from Marcos Mello) + * Fixed build issue with e2fsprogs < 1.41 (Contribution from Marcos Mello) + * Fixed build issue related to xattr.h (Contribution from Lars Wendler) +- Remove fsarchiver-attr.patch: upstreamed + ------------------------------------------------------------------- Tue Feb 20 15:33:54 UTC 2018 - mvetter@suse.com diff --git a/fsarchiver.spec b/fsarchiver.spec index 2c7bc85..c4b415a 100644 --- a/fsarchiver.spec +++ b/fsarchiver.spec @@ -17,19 +17,20 @@ Name: fsarchiver -Version: 0.8.4 +Version: 0.8.5 Release: 0 Summary: Filesystem Archiver -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Archiving/Backup Url: http://www.fsarchiver.org Source0: https://github.com/fdupoux/fsarchiver/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: HOWTO # PATCH-FIX-UPSTREAM Remove conflicting uses of reserved identifiers Patch0: fsarchiver-types.patch -Patch1: fsarchiver-attr.patch BuildRequires: e2fsprogs-devel BuildRequires: libgcrypt-devel +BuildRequires: liblzma5 +BuildRequires: liblzma5 BuildRequires: libtool BuildRequires: libzstd-devel BuildRequires: lzo-devel @@ -53,7 +54,6 @@ the whole archive. %prep %setup -q %patch0 -p1 -%patch1 -p1 cp -p %{SOURCE1} . %build From ac3c8b5aeb3604ce8d04b721b8c7466223747733eb89f22c66aeca7fa52c8a73 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 16 Jul 2018 10:55:07 +0000 Subject: [PATCH 2/2] - Use pkgconfig style dependencies - Drop not needed dependencies OBS-URL: https://build.opensuse.org/package/show/Archiving:Backup/fsarchiver?expand=0&rev=43 --- fsarchiver.changes | 6 ++++++ fsarchiver.spec | 19 ++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/fsarchiver.changes b/fsarchiver.changes index b300c9d..7020beb 100644 --- a/fsarchiver.changes +++ b/fsarchiver.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 16 10:50:25 UTC 2018 - mpluskal@suse.com + +- Use pkgconfig style dependencies +- Drop not needed dependencies + ------------------------------------------------------------------- Mon Jul 16 09:06:55 UTC 2018 - mvetter@suse.com diff --git a/fsarchiver.spec b/fsarchiver.spec index c4b415a..23f3861 100644 --- a/fsarchiver.spec +++ b/fsarchiver.spec @@ -22,24 +22,22 @@ Release: 0 Summary: Filesystem Archiver License: GPL-2.0-only Group: Productivity/Archiving/Backup -Url: http://www.fsarchiver.org +URL: http://www.fsarchiver.org Source0: https://github.com/fdupoux/fsarchiver/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: HOWTO # PATCH-FIX-UPSTREAM Remove conflicting uses of reserved identifiers Patch0: fsarchiver-types.patch -BuildRequires: e2fsprogs-devel BuildRequires: libgcrypt-devel -BuildRequires: liblzma5 -BuildRequires: liblzma5 -BuildRequires: libtool -BuildRequires: libzstd-devel -BuildRequires: lzo-devel BuildRequires: pkgconfig +BuildRequires: pkgconfig(blkid) BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(ext2fs) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(lzo2) +BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FSArchiver is a system tool that allows you to save the contents of @@ -57,7 +55,6 @@ the whole archive. cp -p %{SOURCE1} . %build -autoreconf -fiv %configure make %{?_smp_mflags} V=1 @@ -65,8 +62,8 @@ make %{?_smp_mflags} V=1 %make_install %files -%defattr(-,root,root,-) -%doc ChangeLog COPYING HOWTO NEWS README THANKS internals/ +%license COPYING +%doc ChangeLog HOWTO NEWS README THANKS internals/ %{_sbindir}/%{name} %{_mandir}/man?/*