From 9eff2763287fdfaeb8124e39a68e4603a18b8594 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Aug 28 2017 14:06:16 +0000
Subject: Update to 1.2.0 release


This commit updates tpm2-tss to version 1.2.0. It also does some cleanups
such as changing the SPEC file permission bits, that were not correct and
renames the project prefix from TPM2.0-TSS to tpm2-tss, that is the name
used in the upstream project now.

tpm2-tss 1.2.0 does not build correctly on Fedora with GCC7, this has been
fixed in tpm2-tss master with commits:

64862cb1f7a0 ("implementation.h: Remove preprocessor magic to selectively enable commands.")
87feb17d81b8 ("implementation.h: Remove preprocessor magic to selectively enable algorithms.")

But those can't be easily cherry picked for 1.2.0, so this commit disables
the GCC7 int-in-bool-context warning instead.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index 7e5ef94..88e00f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/TPM2.0-TSS-1.1.0.tar.gz
+/tpm2-tss-1.2.0.tar.gz
diff --git a/sources b/sources
index 11f2e0d..93be4cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (TPM2.0-TSS-1.1.0.tar.gz) = eda7e970971181bbb9315a7c12361eb30791dc54bb1f0a8d9c1dedfa3b1eb9fd8d800f966f8496538e8abae1d29a38d19571bda0bb9de16ed9ca337f1b0f9ce8
+SHA512 (tpm2-tss-1.2.0.tar.gz) = 774be89e849ff7ec7bdd8aa68ea86f6662e4a22571c7f5e8b2ae63073b7645e04eec4bd41104340fde618577a4e263dfb8e636e31a73bf1eb37b965b052c6179
diff --git a/tpm2-tss.spec b/tpm2-tss.spec
old mode 100755
new mode 100644
index 1579da3..3745d8a
--- a/tpm2-tss.spec
+++ b/tpm2-tss.spec
@@ -1,15 +1,15 @@
 Name:           tpm2-tss
-Version:        1.1.0 
-Release:        3%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        TPM2.0 Software Stack
 
-%global  pkg_prefix  TPM2.0-TSS
+%global  pkg_prefix  tpm2-tss
 
 # The entire source code is under BSD except implementation.h and tpmb.h which
 # is under TCGL(Trusted Computing Group License).
 License:        BSD and TCGL
-URL:            https://github.com/01org/TPM2.0-TSS
-Source0:        https://github.com/01org/TPM2.0-TSS/archive/%{version}.tar.gz#/%{pkg_prefix}-%{version}.tar.gz
+URL:            https://github.com/01org/tpm2-tss
+Source0:        https://github.com/01org/tpm2-tss/archive/%{version}.tar.gz#/%{pkg_prefix}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -32,7 +32,8 @@ APIs for applications to access TPM module through kernel TPM drivers.
 
 
 %build
-%configure  --disable-static --disable-silent-rules
+# This flag is only needed for this version, upstream has been fixed and builds correctly.
+%configure EXTRA_CFLAGS="-Wno-int-in-bool-context" --disable-static --disable-silent-rules
 %make_build
 
 %install
@@ -64,12 +65,20 @@ use tpm2-tss.
 %{_libdir}/pkgconfig/sapi.pc
 %{_libdir}/pkgconfig/tcti-device.pc
 %{_libdir}/pkgconfig/tcti-socket.pc
+%{_mandir}/man3/Init*Tcti.3.gz
+%{_mandir}/man7/tcti-*.7.gz
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Aug 28 2017 Javier Martinez Canillas <javierm@redhat.com> - 1.2.0-1
+- Update to 1.2.0 release
+- Use tpm2-tss instead of TPM2.0-TSS as prefix since project name changed
+- Fix SPEC file access mode
+- Include new man pages in %files directive
+
 * Fri Aug 18 2017 Javier Martinez Canillas <javierm@redhat.com> - 1.1.0-3
 - Remove unneeded source tarballs (RHBZ#1482828)