From f048978c31000e6921100f91e90773d3d31bb8a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Tue, 9 Jul 2024 19:08:40 +0400
Subject: [PATCH] Update to v0.9.0 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: https://issues.redhat.com/browse/RHEL-42590

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 .gitignore |  2 ++
 sources    |  2 +-
 swtpm.spec | 23 ++++++++++++-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53ba4d4..b6eb862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
 /swtpm-2ae7b01.tar.gz
 /0001-swtpm_setup-Initialized-argv-to-NULL-Fedore-Rawhide.patch
 /swtpm-d2849a9.tar.gz
+/swtpm-0.8.2.tar.gz
+/swtpm-0.9.0.tar.gz
diff --git a/sources b/sources
index d952d58..bf51d1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (swtpm-d2849a9.tar.gz) = a21f8e0db2cf215b1473a5ddb2afa0fde8313509ae9c5272deb63c32642bb7ec4a9baf9a08e46222c77a645b435f52eeec7e449e6b522643ffc3d2c9140daeb1
+SHA512 (swtpm-0.9.0.tar.gz) = 4f1723679b85218e80ea6aacdffa687e541ee309ddab9bcb8d8e5aa0b461ee431c880f2e300f1dcae112646f3636593005a342ee0cb762ec115aa599369e111c
diff --git a/swtpm.spec b/swtpm.spec
index 2107ba0..2e4533d 100644
--- a/swtpm.spec
+++ b/swtpm.spec
@@ -1,9 +1,5 @@
 %bcond_without gnutls
 
-%global gitdate     20230815
-%global gitcommit   d2849a9f5ced70438d67036693438344b47b4161
-%global gitshortcommit  %(c=%{gitcommit}; echo ${c:0:7})
-
 # Macros needed by SELinux
 %global selinuxtype targeted
 %global moduletype  contrib
@@ -11,11 +7,11 @@
 
 Summary: TPM Emulator
 Name:           swtpm
-Version:        0.8.1
-Release:        6%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 License:        BSD-3-Clause
-Url:            http://github.com/stefanberger/swtpm
-Source0:        %{url}/archive/%{gitcommit}/%{name}-%{gitshortcommit}.tar.gz
+Url:            https://github.com/stefanberger/swtpm
+Source0:        https://github.com/stefanberger/swtpm/archive/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires: make
 BuildRequires:  git-core
@@ -97,7 +93,7 @@ BuildArch:      noarch
 SELinux security policy for swtpm.
 
 %prep
-%autosetup -S git -n %{name}-%{gitcommit} -p1
+%autosetup -S git -n %{name}-%{version} -p1
 
 %build
 
@@ -120,14 +116,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la,so}
 
 %post selinux
 for pp in /usr/share/selinux/packages/swtpm.pp \
-          /usr/share/selinux/packages/swtpm_svirt.pp; do
+          /usr/share/selinux/packages/swtpm_svirt.pp \
+          /usr/share/selinux/packages/swtpm_libvirt.pp; do
   %selinux_modules_install -s %{selinuxtype} ${pp}
 done
 restorecon %{_bindir}/swtpm
 
 %postun selinux
 if [ $1 -eq  0 ]; then
-  for p in swtpm swtpm_svirt; do
+  for p in swtpm_libvirt swtpm swtpm_svirt; do
     %selinux_modules_uninstall -s %{selinuxtype} $p
   done
 fi
@@ -146,6 +143,7 @@ fi
 
 %files selinux
 %{_datadir}/selinux/packages/swtpm.pp
+%{_datadir}/selinux/packages/swtpm_libvirt.pp
 %{_datadir}/selinux/packages/swtpm_svirt.pp
 
 %files libs
@@ -193,6 +191,9 @@ fi
 %{_datadir}/swtpm/swtpm-create-tpmca
 
 %changelog
+* Tue Jul 09 2024 Marc-André Lureau <marcandre.lureau@redhat.com> - 0.9.0-1
+- Update to v0.9.0 release
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.8.1-6
 - Bump release for June 2024 mass rebuild