forked from pool/fsarchiver
Accepting request 623111 from Archiving:Backup
- Use pkgconfig style dependencies - Drop not needed dependencies - 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/623111 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fsarchiver?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
97a7440667
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:72cbf31df756bfa6a3b9514cfe148f6af12c5ca861bca8d3755ffea6b856ff66
|
||||
size 298793
|
||||
3
fsarchiver-0.8.5.tar.gz
Normal file
3
fsarchiver-0.8.5.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c694f52e42703d7e8c4d56f2db97a8ff5616df1d723429126de97c22217c88fe
|
||||
size 298502
|
||||
@ -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 <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
-#include <attr/xattr.h>
|
||||
+#include <sys/xattr.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <gcrypt.h>
|
||||
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 <sys/param.h>
|
||||
#include <sys/statvfs.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <attr/xattr.h>
|
||||
+#include <errno.h>
|
||||
+#include <sys/xattr.h>
|
||||
#include <zlib.h>
|
||||
#include <assert.h>
|
||||
#include <gcrypt.h>
|
||||
@@ -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])
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- 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
|
||||
|
||||
|
||||
@ -17,28 +17,27 @@
|
||||
|
||||
|
||||
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
|
||||
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: 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
|
||||
@ -53,11 +52,9 @@ the whole archive.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
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?/*
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user