diff --git a/_service b/_service
deleted file mode 100644
index ba504fc..0000000
--- a/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
- git
- https://github.com/libyal/libluksde
- 7b40e4b77cf02541dea5a327bbd98a9f08868e8d
-
- 20210419
-
-
- *.tar
- xz
-
-
-
diff --git a/libluksde-20210419.tar.xz b/libluksde-20210419.tar.xz
deleted file mode 100644
index 3f6a483..0000000
--- a/libluksde-20210419.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb191cc148d1f9ab49f38a3ed4f6423b298e5d12aadfaa089c9059dc3f03a23e
-size 154244
diff --git a/libluksde-experimental-20220121.tar.gz b/libluksde-experimental-20220121.tar.gz
new file mode 100644
index 0000000..4cee3c2
--- /dev/null
+++ b/libluksde-experimental-20220121.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52ea8af9fda58c2cf163f35605257f549a4e7fbfe3d0245766beb4517c986197
+size 1649266
diff --git a/libluksde-experimental-20220121.tar.gz.asc b/libluksde-experimental-20220121.tar.gz.asc
new file mode 100644
index 0000000..00cc369
--- /dev/null
+++ b/libluksde-experimental-20220121.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHqlu4ACgkQ2WJeXXrQ
+F35gsgf+ITJTLtodixBnDrM3mHl5evsIPtNmpeN/E1nn+JmmYZYD/AfBQ4Lp8E9c
+3C5ZET3xT3h3ktDAxxwWt94MPQTbVi4C9JnSWeS2cg+kjouQqFgDB/ou83GxE8hx
+sig/LIwptL3iEzss/1a3eDfMINpMWQmjapSqeF6GCBiGg6vufRyHD9WHG3vSZtg5
+sO8ONUW/GKvRLxRytJjG3/fv4WoRwfyxPJfqwsoXDuJXAsHzq9zQAvZgExICVTSM
+SY9Nm7Zeay1yg6OHitMIqWkddtE2IZbZQlUVyuff8VefFTWMQ4QmbVUjk3TYS18m
+PDI/6ygAw4ufbzYYAqIzZ/Bi3Lr8hw==
+=qDlA
+-----END PGP SIGNATURE-----
diff --git a/libluksde.changes b/libluksde.changes
index e59557c..3b6b68f 100644
--- a/libluksde.changes
+++ b/libluksde.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 21 13:08:28 UTC 2022 - Jan Engelhardt
+
+- Update to release 20220121
+ * Unspecified changes to volume unlocking.
+
-------------------------------------------------------------------
Wed Jun 30 08:46:23 UTC 2021 - Steve Kowalik
diff --git a/libluksde.keyring b/libluksde.keyring
new file mode 100644
index 0000000..da327a1
--- /dev/null
+++ b/libluksde.keyring
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFSf2CoBCADJOuDavJeI0IhBPnIYol/ZfE2bXvmRJMGPasU1H6CJagTkc/Iq
+SuUpiix7HcYgyGY7qHO7B1Wpnh5plc03dFW2ysTnOk8NzSqWF/gbWIYbRg8GUATg
+fGy7NoIio/hbBlWkM0rPQq7AIK79m0m2U4ZAuQPamAC4y8H9j/SyTFI1gQNeExZ+
+L8DE3QjSx4GAVgb4cfdQQPwGmoOIgKSudZN6oPiOj+MM3yh1vv49C45ChSWNWGjB
+683zFbjuS0A483MFPI8iQGC8JecmQGvpzcOoSLkyTjT7vleFYGkfj8N0FB5Bq2L5
+TT2w9lQKEjvWTe//G4tXgnGXy8PwqRZmj2CfABEBAAG0JUpvYWNoaW0gTWV0eiA8
+am9hY2hpbS5tZXR6QGdtYWlsLmNvbT6JATkEEwECACMFAlSf2CoCGwMHCwkIBwMC
+AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDZYl5detAXfkBgCAC4W/adqlNYSkK5VDoU
+FDMMRDffVVe0WdPlW7PDJXR0R0IParwHD+FJY3jtNA2upqKTCXm7JbQRN/n4Qrfb
+PJHr0EoBF7iG6kT4RKocImciuMJaj4fTolGNdc0iRKl5tMIb64RiE47XhN7v6/oP
+UaqrbnF5EW9EZ2AqOSTEcLeTgKLErMlv2dLjFXg8jXGNxTkmi6BELyaczgWBgD9I
+3tfMvXLswI5q9RtpJUc8oAfV81ibfFm6UeItQxM6SM0WLKILlXIQqqiQ4oCbAm4R
+PJI4RwoJYAhcJOmUXrAUC5obhjkf9Qo0RJzVMFLuQXDiRV5W5dBL/hs9M0FVWDxv
+siZNuQENBFSf2CoBCADODF+4Q3nXhmvTpVZTh17gYzCQqOHKctyTwoWg0VidmWWD
+lmtDBX8hWh1fjm0KQezzYagddgjlPncgq/oyrhvq2fEG3nch5qpb8k94v6KlhC9+
+SoJAwFoMLfCG8lQXASHKFvt3LJKJhS3laOLzzc4QNhWG7KRrwiOcp47bjoL8x+9L
+U1EkGZR1OMGWYaJmokEcPTNchLEgL7MMRtdaPmh9R2f8N7eqb/mKNZCxyt89a3yw
+uapLtYe5dRPEnpL00PXd9uMlwMbyuMcP60CouMFGqqKeBITWTd8vPsz+CpictNZw
+Toa25CCGgoGm2pP5catMdjH3SDZef5Mkqq5uZT/pABEBAAGJAR8EGAECAAkFAlSf
+2CoCGwwACgkQ2WJeXXrQF34oPQf6AyuzFs60DKrldW8tKPZxSmrQoOEK5h+w1WUQ
+RTvJyE5CECzocC68s46jGkluMa4wHzBDGYH2CoWAqXpnEC4UivBtlZses92vdqtM
+5kqWrSkamTwsggtVyqHvHUW+OSiJLluGA1amn1sVaQUAIP9PEk/q7Qj9VzctKGA5
+3UVw6NA/sYad+IIg95qu798GF4nrtyY9nhQg9YM/6C2CF6FpJJUlNMPXm9zx20dL
+cuAm/5zwU7xoNbV8c829EiqrRCdJMY8/LPriF7fDxUQa3AAptFZoWWkt4T5QbjB4
+VpPayIneEZRdCFktpSPgVYLm8HboNXeladSTdOtJS0HaoPzMTg==
+=fRjn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libluksde.spec b/libluksde.spec
index d22c8f2..c0c9e81 100644
--- a/libluksde.spec
+++ b/libluksde.spec
@@ -1,7 +1,7 @@
#
# spec file for package libluksde
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,36 +18,41 @@
%define lname libluksde1
Name: libluksde
-Version: 20210419
+Version: 20220121
Release: 0
Summary: Library and tools to access LUKS Disk Encryption encrypted files
License: GFDL-1.3-or-later AND LGPL-3.0-or-later
Group: Productivity/File utilities
URL: https://github.com/libyal/libluksde
-Source: %{name}-%{version}.tar.xz
+Source: https://github.com/libyal/libluksde/releases/download/%version/libluksde-experimental-%version.tar.gz
+Source2: https://github.com/libyal/libluksde/releases/download/%version/libluksde-experimental-%version.tar.gz.asc
+Source9: %name.keyring
Patch1: system-libs.patch
+BuildRequires: %python_module devel
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
BuildRequires: pkg-config
-BuildRequires: pkgconfig(libbfio) >= 20201229
-BuildRequires: pkgconfig(libcaes) >= 20201012
-BuildRequires: pkgconfig(libcdata) >= 20200509
-BuildRequires: pkgconfig(libcerror) >= 20201121
+BuildRequires: python-rpm-macros
+BuildRequires: pkgconfig(libbfio) >= 20220120
+BuildRequires: pkgconfig(libcaes) >= 20210522
+BuildRequires: pkgconfig(libcdata) >= 20220115
+BuildRequires: pkgconfig(libcerror) >= 20220101
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(libclocale) >= 20220107
+BuildRequires: pkgconfig(libcnotify) >= 20220108
+BuildRequires: pkgconfig(libcpath) >= 20220108
+BuildRequires: pkgconfig(libcsplit) >= 20220109
+BuildRequires: pkgconfig(libcthreads) >= 20220102
+BuildRequires: pkgconfig(libfcache) >= 20220110
BuildRequires: pkgconfig(libfcrypto) >= 20200104
-BuildRequires: pkgconfig(libfdata) >= 20201129
-BuildRequires: pkgconfig(libfdatetime) >= 20180910
-BuildRequires: pkgconfig(libfguid) >= 20180724
+BuildRequires: pkgconfig(libfdata) >= 20211023
+BuildRequires: pkgconfig(libfdatetime) >= 20220112
+BuildRequires: pkgconfig(libfguid) >= 20220113
BuildRequires: pkgconfig(libhmac) >= 20200104
-BuildRequires: pkgconfig(libuna) >= 20201204
+BuildRequires: pkgconfig(libuna) >= 20220102
BuildRequires: pkgconfig(python3)
+%python_subpackages
%description
Library and tools to access the New Technology File System (NTFS).
@@ -82,24 +87,22 @@ Requires: %{lname} = %{version}
This subpackage contains libraries and header files for developing
applications that want to make use of %{name}.
-%package -n python3-%{name}
-Summary: Python 3 bindings for libluksde
-License: LGPL-3.0-or-later
-Group: Development/Languages/Python
-
-%description -n python3-%{name}
-Python 3 binding for libluksde, which can access the NTFS filesystem.
-
%prep
%autosetup -p1
%build
-if [ ! -e configure ]; then ./autogen.sh; fi
-%configure --disable-static --enable-wide-character-type --enable-python3
+autoreconf -fi
+# OOT builds are presently broken, so we have to install
+# within each python iteration now, not in %%install.
+%{python_expand #
+%configure --disable-static --enable-wide-character-type --enable-python PYTHON_VERSION="%{$python_bin_suffix}"
%make_build
+%make_install DESTDIR="%_builddir/rt"
+%make_build clean
+}
%install
-%make_install
+mv %_builddir/rt/* %buildroot/
find %{buildroot} -type f -name "*.la" -delete -print
%post -n %{lname} -p /sbin/ldconfig
@@ -109,20 +112,20 @@ find %{buildroot} -type f -name "*.la" -delete -print
%license COPYING*
%{_libdir}/libluksde.so.*
-%files tools
+%files -n %name-tools
%{_bindir}/luksde*
%{_mandir}/man1/luksdeinfo.1*
%{_mandir}/man1/luksdemount.1*
-%files devel
+%files -n %name-devel
%{_includedir}/libluksde.h
%{_includedir}/libluksde/
%{_libdir}/libluksde.so
%{_libdir}/pkgconfig/libluksde.pc
%{_mandir}/man3/libluksde.3*
-%files -n python3-%{name}
+%files %python_files
%license COPYING*
-%{python3_sitearch}/pyluksde.so
+%{python_sitearch}/pyluksde.so
%changelog