diff --git a/_service b/_service
new file mode 100644
index 0000000..2103265
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+
+
+ git
+ https://github.com/libyal/libfwevt
+ f3314d46b301ade8b29c8c95882811a9b6d9326b
+
+ 20210508
+
+
+ *.tar
+ xz
+
+
+
diff --git a/libfwevt-20210508.tar.xz b/libfwevt-20210508.tar.xz
new file mode 100644
index 0000000..9f5a8de
--- /dev/null
+++ b/libfwevt-20210508.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c85d609f21813d0e59f1e441b20a74891a4413fc6221051cdc204e55ab30abe
+size 110216
diff --git a/libfwevt-experimental-20200709.tar.gz b/libfwevt-experimental-20200709.tar.gz
deleted file mode 100644
index 90c06ff..0000000
--- a/libfwevt-experimental-20200709.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74ae1f3f81b4249a70dbf5d2fcde7982b0f7cab58f576a2c86584cf769c18852
-size 1259129
diff --git a/libfwevt.changes b/libfwevt.changes
index 00291f7..91f926d 100644
--- a/libfwevt.changes
+++ b/libfwevt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 13 12:02:18 UTC 2021 - Jan Engelhardt
+
+- Update to snapshot 20210508 (f3314d46)
+ * No changelog was provided
+- Add system-libs.patch
+
-------------------------------------------------------------------
Tue Dec 29 22:51:20 UTC 2020 - Greg Freemyer
diff --git a/libfwevt.spec b/libfwevt.spec
index df0e11a..ea61774 100644
--- a/libfwevt.spec
+++ b/libfwevt.spec
@@ -1,7 +1,7 @@
#
# spec file for package libfwevt
#
-# 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,27 +17,27 @@
%define lname libfwevt1
-%define timestamp 20200709
Name: libfwevt
-Version: 0~%{timestamp}
+Version: 20210508
Release: 0
Summary: Library for Windows NT data types
-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/libfwevt/wiki
-Source: https://github.com/libyal/libfwevt/releases/download/%timestamp/%{name}-experimental-%{timestamp}.tar.gz
-#BuildRequires: pkg-config
-BuildRequires: python-devel
-BuildRequires: pkgconfig(libcdata)
-BuildRequires: pkgconfig(libcerror)
-BuildRequires: pkgconfig(libcnotify)
-BuildRequires: pkgconfig(libcstring)
-BuildRequires: pkgconfig(libcthreads)
-BuildRequires: pkgconfig(libfdatetime)
-BuildRequires: pkgconfig(libfguid)
-BuildRequires: pkgconfig(libfvalue)
-BuildRequires: pkgconfig(libuna)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+URL: https://github.com/libyal/libfwevt
+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(libcdata) >= 20200509
+BuildRequires: pkgconfig(libcerror) >= 20201121
+BuildRequires: pkgconfig(libcnotify) >= 20200913
+BuildRequires: pkgconfig(libcthreads) >= 20200508
+BuildRequires: pkgconfig(libfdatetime) >= 20180910
+BuildRequires: pkgconfig(libfguid) >= 20180724
+BuildRequires: pkgconfig(libfvalue) >= 20210510
+BuildRequires: pkgconfig(libuna) >= 20201204
%description
Library to provide Windows NT data type support for the libyal family of libraries.
@@ -54,7 +54,7 @@ libyal is typically used in digital forensic tools.
%package devel
Summary: Development files for libfwevt
-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: Development/Libraries/C and C++
Requires: %{lname} = %{version}
@@ -65,29 +65,25 @@ This subpackage contains libraries and header files for developing
applications that want to make use of libfwevt.
%prep
-%setup -q -n libfwevt-%{timestamp}
+%autosetup -p1
%build
-%configure --disable-static --enable-wide-character-type --enable-python
-make %{?_smp_mflags}
+if [ ! -e configure ]; then ./autogen.sh; fi
+%configure --disable-static
+%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*
%{_libdir}/libfwevt.so.*
%files devel
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
%license COPYING*
%{_includedir}/libfwevt.h
%{_includedir}/libfwevt/
diff --git a/system-libs.patch b/system-libs.patch
new file mode 100644
index 0000000..5b94fad
--- /dev/null
+++ b/system-libs.patch
@@ -0,0 +1,64 @@
+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 | 16 ----------------
+ configure.ac | 8 --------
+ 2 files changed, 24 deletions(-)
+
+Index: libfwevt/Makefile.am
+===================================================================
+--- libfwevt.orig/Makefile.am
++++ libfwevt/Makefile.am
+@@ -3,14 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ include \
+ common \
+- libcerror \
+- libcthreads \
+- libcdata \
+- libcnotify \
+- libuna \
+- libfdatetime \
+- libfguid \
+- libfvalue \
+ libfwevt \
+ po \
+ manuals \
+@@ -61,14 +53,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)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
+- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
+ (cd $(srcdir)/libfwevt && $(MAKE) $(AM_MAKEFLAGS))
+ (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+
+Index: libfwevt/configure.ac
+===================================================================
+--- libfwevt.orig/configure.ac
++++ libfwevt/configure.ac
+@@ -120,14 +120,6 @@ 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([libcnotify/Makefile])
+-AC_CONFIG_FILES([libuna/Makefile])
+-AC_CONFIG_FILES([libfdatetime/Makefile])
+-AC_CONFIG_FILES([libfguid/Makefile])
+-AC_CONFIG_FILES([libfvalue/Makefile])
+ AC_CONFIG_FILES([libfwevt/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])