From db769ffa91566dfb8de53e3b14844f1b4cc7571a Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <npmccallum@redhat.com>
Date: Mon, 13 Aug 2018 23:37:17 -0400
Subject: [PATCH] Update to v11

---
 .gitignore  |  4 +---
 clevis.spec | 29 +++++++++++++++++------------
 sources     |  2 +-
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f7b9ab2..850df0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/clevis-8.tar.bz2
-/clevis-9.tar.bz2
-/clevis-10.tar.bz2
+/clevis-11.tar.xz
diff --git a/clevis.spec b/clevis.spec
index b9a437e..6766d98 100644
--- a/clevis.spec
+++ b/clevis.spec
@@ -1,15 +1,20 @@
 %global _hardened_build 1
 
 Name:           clevis
-Version:        10
-Release:        2%{?dist}
+Version:        11
+Release:        1%{?dist}
 Summary:        Automated decryption framework
 
 License:        GPLv3+
 URL:            https://github.com/latchset/%{name}
-Source0:        https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+Source0:        https://github.com/latchset/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 
 BuildRequires:  gcc
+BuildRequires:  meson
+BuildRequires:  asciidoc
+BuildRequires:  ninja-build
+BuildRequires:  bash-completion
+
 BuildRequires:  libjose-devel >= 8
 BuildRequires:  libluksmeta-devel >= 8
 BuildRequires:  audit-libs-devel
@@ -90,19 +95,19 @@ Automatically unlocks LUKSv1 block devices in desktop environments that
 use UDisks2 or storaged (like GNOME).
 
 %prep
-%setup -q
+%autosetup
 
 %build
-%configure --enable-user=clevis --enable-group=clevis
-%make_build V=1
+%meson -Duser=clevis -Dgroup=clevis
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 %check
 desktop-file-validate \
   %{buildroot}/%{_sysconfdir}/xdg/autostart/%{name}-luks-udisks2.desktop
-%make_build check
+%meson_test
 
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
@@ -113,17 +118,15 @@ exit 0
 
 %files
 %license COPYING
-%{_bindir}/%{name}-decrypt-http
+%{_datadir}/bash-completion/
 %{_bindir}/%{name}-decrypt-tang
 %{_bindir}/%{name}-decrypt-tpm2
 %{_bindir}/%{name}-decrypt-sss
 %{_bindir}/%{name}-decrypt
-%{_bindir}/%{name}-encrypt-http
 %{_bindir}/%{name}-encrypt-tang
 %{_bindir}/%{name}-encrypt-tpm2
 %{_bindir}/%{name}-encrypt-sss
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}-encrypt-http.1*
 %{_mandir}/man1/%{name}-encrypt-tang.1*
 %{_mandir}/man1/%{name}-encrypt-tpm2.1*
 %{_mandir}/man1/%{name}-encrypt-sss.1*
@@ -138,7 +141,6 @@ exit 0
 %{_bindir}/%{name}-luks-unlock
 %{_bindir}/%{name}-luks-unbind
 %{_bindir}/%{name}-luks-bind
-%{_bindir}/%{name}-bind-luks
 
 %files systemd
 %{_libexecdir}/%{name}-luks-askpass
@@ -153,6 +155,9 @@ exit 0
 %attr(4755, root, root) %{_libexecdir}/%{name}-luks-udisks2
 
 %changelog
+* Tue Aug 14 2018 Nathaniel McCallum <npmccallum@redhat.com> - 11-2
+- Update to v11
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index e41ffb3..13129af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clevis-10.tar.bz2) = 4fb95790eef84be414a0b5bcc992097ed4eb36c89bb3ff76e09ea45d7106b980f6b5f79566488c58ca9558f533235e5f95580e2c40d9f1a291d0def89481352f
+SHA512 (clevis-11.tar.xz) = f15033a27f662986c48ca36390d3b0f127bc691b3cd7a35d437db2e2b123f8bbebd6385d799620b11f42db0d279a2030d5bf69e55e96a584800393bf47a00368