diff --git a/_service b/_service
new file mode 100644
index 0000000..b096efe
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+
+
+ git
+ https://github.com/libyal/libfsext
+ 3f4411ea984d3b14bde75bcbbb4d9c9820f1d8cf
+
+ 20210513
+
+
+ *.tar
+ xz
+
+
+
diff --git a/libfsext-20210513.tar.xz b/libfsext-20210513.tar.xz
new file mode 100644
index 0000000..8398ff1
--- /dev/null
+++ b/libfsext-20210513.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70eb63236ee45a60b149b422bb1dcbec635f2ec7740c32975059c312396831f3
+size 180408
diff --git a/libfsext-experimental-20201107.tar.gz b/libfsext-experimental-20201107.tar.gz
deleted file mode 100644
index bb038fe..0000000
--- a/libfsext-experimental-20201107.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da823fc046b66647287dc3f37c59d3ef98ac84d0d964f716234595da447df09b
-size 1640724
diff --git a/libfsext.changes b/libfsext.changes
index 4af4bd4..be606cc 100644
--- a/libfsext.changes
+++ b/libfsext.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 14 22:42:07 UTC 2021 - Jan Engelhardt
+
+- Update to snapshot 20210513 (3f4411ea)
+ * No changelog was provided
+- Add system-libs.patch
+
-------------------------------------------------------------------
Fri Nov 13 03:44:31 UTC 2020 - Greg Freemyer
diff --git a/libfsext.spec b/libfsext.spec
index 51f91c8..fd769df 100644
--- a/libfsext.spec
+++ b/libfsext.spec
@@ -1,7 +1,7 @@
#
# spec file for package libfsext
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,34 +17,35 @@
%define lname libfsext1
-%define timestamp 20201107
Name: libfsext
-Version: 0~%{timestamp}
+Version: 20210513
Release: 0
Summary: Library and tools to access the Extended File System
-License: LGPL-3.0-or-later AND GFDL-1.3-or-later
+License: GFDL-1.3-or-later AND LGPL-3.0-or-later
Group: Productivity/File utilities
-URL: https://github.com/libyal/libfsext/wiki
-Source: https://github.com/libyal/libfsext/releases/download/%timestamp/%{name}-experimental-%{timestamp}.tar.gz
-
+URL: https://github.com/libyal/libfsext
+Source: %name-%version.tar.xz
+Patch1: system-libs.patch
+BuildRequires: c_compiler
+BuildRequires: gettext-tools >= 0.18.1
+BuildRequires: libtool
BuildRequires: pkg-config
-BuildRequires: pkgconfig(libbfio) >= 20130721
-BuildRequires: pkgconfig(libcdata) >= 20140105
-BuildRequires: pkgconfig(libcerror) >= 20170101
-BuildRequires: pkgconfig(libcfile) >= 20130609
-BuildRequires: pkgconfig(libclocale) >= 20130609
-BuildRequires: pkgconfig(libcnotify) >= 20120425
-BuildRequires: pkgconfig(libcpath) >= 20130609
-BuildRequires: pkgconfig(libcsplit) >= 20130609
-BuildRequires: pkgconfig(libcthreads) >= 20130723
-BuildRequires: pkgconfig(libfcache) >= 20120405
-BuildRequires: pkgconfig(libfdata) >= 20120405
-BuildRequires: pkgconfig(libfguid) >= 20130317
-BuildRequires: pkgconfig(libuna) >= 20120425
-BuildRequires: pkgconfig(libfdatetime)
-BuildRequires: pkgconfig(libhmac)
+BuildRequires: pkgconfig(libbfio) >= 20201229
+BuildRequires: pkgconfig(libcdata) >= 20200509
+BuildRequires: pkgconfig(libcerror) >= 20201121
+BuildRequires: pkgconfig(libcfile) >= 20201229
+BuildRequires: pkgconfig(libclocale) >= 20200913
+BuildRequires: pkgconfig(libcnotify) >= 20200913
+BuildRequires: pkgconfig(libcpath) >= 20200623
+BuildRequires: pkgconfig(libcsplit) >= 20200703
+BuildRequires: pkgconfig(libcthreads) >= 20200508
+BuildRequires: pkgconfig(libfcache) >= 20200708
+BuildRequires: pkgconfig(libfdata) >= 20201129
+BuildRequires: pkgconfig(libfdatetime) >= 20180910
+BuildRequires: pkgconfig(libfguid) >= 20180724
+BuildRequires: pkgconfig(libhmac) >= 20200104
+BuildRequires: pkgconfig(libuna) >= 20201204
BuildRequires: pkgconfig(python3)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
libfsext is a library to access the Extended File System (ext).
@@ -99,8 +100,8 @@ Requires: %{lname} = %{version}
Tools to access the Extended File System. See libfsext for additional details.
%package devel
-Summary: Development files for libfsext, Extended File System (ext) library
-License: LGPL-3.0-or-later AND GFDL-1.3-or-later
+Summary: Development files for libfsext, Extended File System (ext) library
+License: GFDL-1.3-or-later AND LGPL-3.0-or-later
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
@@ -124,37 +125,31 @@ libfsext is a library to access extended file system (ext) format. See libfsext
This package contains Python 3 bindings for libfsext.
%prep
-%setup -q -n libfsext-%{timestamp}
+%autosetup -p1
%build
+if [ ! -e configure ]; then ./autogen.sh; fi
%configure --disable-static --enable-wide-character-type --enable-python3
-make %{?_smp_mflags}
+%make_build
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%post -n %{lname} -p /sbin/ldconfig
-
%postun -n %{lname} -p /sbin/ldconfig
%files -n %{lname}
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
-%license COPYING
+%license COPYING*
%{_libdir}/libfsext.so.*
%files tools
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
-%license COPYING
+%license COPYING*
%{_bindir}/fsext*
%{_mandir}/man1/fsext*.1*
%files devel
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
-%license COPYING
+%license COPYING*
%{_includedir}/libfsext.h
%{_includedir}/libfsext/
%{_libdir}/libfsext.so
@@ -162,9 +157,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_mandir}/man3/libfsext.3*
%files -n python3-%{name}
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
-%license COPYING
+%license COPYING*
%{python3_sitearch}/pyfsext.so
%changelog
diff --git a/system-libs.patch b/system-libs.patch
new file mode 100644
index 0000000..6fa7a61
--- /dev/null
+++ b/system-libs.patch
@@ -0,0 +1,89 @@
+From: Jan Engelhardt
+Date: 2021-05-12 17:36:02.536572543 +0200
+
+Some dirs are not present in snapshots directly generated from git
+(nor are they marked as a submodule). Patch it out, since we have
+them as system libs.
+---
+ Makefile.am | 29 -----------------------------
+ configure.ac | 15 ---------------
+ 2 files changed, 44 deletions(-)
+
+Index: libfsext/Makefile.am
+===================================================================
+--- libfsext.orig/Makefile.am
++++ libfsext/Makefile.am
+@@ -3,22 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ include \
+ common \
+- libcerror \
+- libcthreads \
+- libcdata \
+- libclocale \
+- libcnotify \
+- libcsplit \
+- libuna \
+- libcfile \
+- libcpath \
+- libbfio \
+- libfcache \
+- libfdata \
+- libfdatetime \
+- libfguid \
+ libfsext \
+- libhmac \
+ fsexttools \
+ pyfsext \
+ pyfsext-python2 \
+@@ -79,20 +64,6 @@ lib: library
+
+ library:
+ (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
+ (cd $(srcdir)/libfsext && $(MAKE) $(AM_MAKEFLAGS))
+ (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+
+Index: libfsext/configure.ac
+===================================================================
+--- libfsext.orig/configure.ac
++++ libfsext/configure.ac
+@@ -173,25 +173,10 @@ dnl Generate Makefiles
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([include/Makefile])
+ AC_CONFIG_FILES([common/Makefile])
+-AC_CONFIG_FILES([libcerror/Makefile])
+-AC_CONFIG_FILES([libcthreads/Makefile])
+-AC_CONFIG_FILES([libcdata/Makefile])
+-AC_CONFIG_FILES([libclocale/Makefile])
+-AC_CONFIG_FILES([libcnotify/Makefile])
+-AC_CONFIG_FILES([libcsplit/Makefile])
+-AC_CONFIG_FILES([libuna/Makefile])
+-AC_CONFIG_FILES([libcfile/Makefile])
+-AC_CONFIG_FILES([libcpath/Makefile])
+-AC_CONFIG_FILES([libbfio/Makefile])
+-AC_CONFIG_FILES([libfcache/Makefile])
+-AC_CONFIG_FILES([libfdata/Makefile])
+-AC_CONFIG_FILES([libfdatetime/Makefile])
+-AC_CONFIG_FILES([libfguid/Makefile])
+ AC_CONFIG_FILES([libfsext/Makefile])
+ AC_CONFIG_FILES([pyfsext/Makefile])
+ AC_CONFIG_FILES([pyfsext-python2/Makefile])
+ AC_CONFIG_FILES([pyfsext-python3/Makefile])
+-AC_CONFIG_FILES([libhmac/Makefile])
+ AC_CONFIG_FILES([fsexttools/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])