From 22c0eec132880ced4644afaedab2e447913d0e50 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Dec 26 2019 02:04:19 +0000
Subject: Update to 1.0-RC1, spec file updates and cleanups for stable releases


---

diff --git a/.gitignore b/.gitignore
index f616753..d1acaee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /tpm2-pkcs11-0-git1e84553.tar.gz
 /tpm2-pkcs11-0-git2f3058c.tar.gz
 /tpm2-pkcs11-0-git0b7ceff.tar.gz
+/tpm2-pkcs11-1.0-RC1.tar.gz
diff --git a/sources b/sources
index a2fcd80..9066acd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-pkcs11-0-git0b7ceff.tar.gz) = b2a373e2e497c432ea981f7ffd49f0182416a7afc661a176eac953ac4c3eb991518ccb7d6a2ed72a64113b8fa145903a3646c85422d3431c907bc443f5fa2635
+SHA512 (tpm2-pkcs11-1.0-RC1.tar.gz) = 50bf34281af3c7edddbff6ab3aae5420cda5a2b734cb1a2f836ec48599a416de639582e953c76d1e5e385a0ad26ec4935be035d766bb7d8a897943a274249ce5
diff --git a/tpm2-pkcs11.spec b/tpm2-pkcs11.spec
index 20406c9..9382181 100644
--- a/tpm2-pkcs11.spec
+++ b/tpm2-pkcs11.spec
@@ -1,67 +1,59 @@
-%global commit0 0b7ceffb81dc5d9863fa6e4bdae5cf393dfd038a
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global candidate RC1
 
 Name:		tpm2-pkcs11
-Version:	0
-Release:	0.8.20191011git%{shortcommit0}%{?dist}
+Version:	1.0
+Release:	0.1%{?candidate:.%{candidate}}%{?dist}
 Summary:	PKCS#11 interface for TPM 2.0 hardware
 
 License:	BSD
 URL:		https://github.com/tpm2-software/tpm2-pkcs11
-Source0:	https://github.com/tpm2-software/tpm2-pkcs11/archive/%{commit0}.tar.gz#/%{name}-%{version}-git%{shortcommit0}.tar.gz
+Source0:	https://github.com/tpm2-software/tpm2-pkcs11/releases/download/%{version}%{?candidate:-%{candidate}}/%{name}-%{version}%{?candidate:-%{candidate}}.tar.gz
 
-BuildRequires:	automake
-BuildRequires:	libtool
 BuildRequires:	gcc
 BuildRequires:	make
-BuildRequires:	tpm2-tss-devel
-BuildRequires:	tpm2-tools
 BuildRequires:	python3
-BuildRequires:	openssl-devel
-BuildRequires:	autoconf-archive
-BuildRequires:	sqlite-devel
 BuildRequires:	libgcrypt-devel
+BuildRequires:	libyaml-devel
+BuildRequires:	openssl-devel
 BuildRequires:	p11-kit-devel
+BuildRequires:	sqlite-devel
+BuildRequires:	tpm2-tools
+BuildRequires:	tpm2-tss-devel
 # for tests
 BuildRequires:	libcmocka-devel
 BuildRequires:	dbus-daemon
 # for tools
 BuildRequires:	python3-devel
+BuildRequires:	python3-pyasn1-modules
 BuildRequires:	python3-pyyaml
 BuildRequires:	python3-cryptography
 
-%package tools
-# Automatic generator does not work for me even though the requires.txt is in place
-Requires:	python3-pyyaml
-Requires:	python3-cryptography
-Summary: The tools required to setup and configure TPM2 for PKCS#11
-
 %description
 PKCS #11 is a Public-Key Cryptography Standard that defines a standard method
 to access cryptographic services from tokens/ devices such as hardware security
 modules (HSM), smart cards, etc. In this project we intend to use a TPM2 device
 as the cryptographic token.
 
+%package tools
+Summary: The tools required to setup and configure TPM2 for PKCS#11
+# Automatic generator does not work for me even though the requires.txt is in place
+Requires:	python3-pyyaml
+Requires:	python3-cryptography
+
 %description tools
 The tools required to setup and configure TPM2 for PKCS#11.
 
 %prep
-%setup -q -n tpm2-pkcs11-%{commit0}
+%setup -q -n %{name}-%{version}%{?candidate:-%{candidate}}
 
 
 %build
-./bootstrap
 %configure --enable-unit
-make %{?_smp_mflags}
+%{make_build}
 cd tools
 %py3_build
 
 
-%check
-make check
-cd tools
-%{__python3} setup.py test
-
 %install
 %make_install
 rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tpm2-pkcs11.pc
@@ -74,6 +66,13 @@ cd tools
 sed -i "s/python/python3/g" tpm2_ptool
 install -Dpm 755 tpm2_ptool $RPM_BUILD_ROOT%{_bindir}/tpm2_ptool
 
+
+%check
+make check
+cd tools
+%{__python3} setup.py test
+
+
 %files
 %license LICENSE
 %{_datadir}/p11-kit/modules/tpm2_pkcs11.module
@@ -88,6 +87,9 @@ install -Dpm 755 tpm2_ptool $RPM_BUILD_ROOT%{_bindir}/tpm2_ptool
 
 
 %changelog
+* Thu Dec 26 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.0-0.1-RC1
+- Update to 1.0 RC1 candidate
+
 * Fri Oct 11 2019 Jakub Jelen <jjelen@redhat.com> - 0-0.3.20191011git0b7ceff
 - Update to current git version
 - Fix missing requires (#1757179)