From b3574b6515eddc4c1c7c96b1430833c8763a5ded Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Nov 29 2017 09:13:43 +0000
Subject: Update to 3.0 release candidate 1


This commit updates tpm2-tools to version 3.0-rc1. It also does some
cleanups to the package such as using the latest URL for the project
repository.

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

---

diff --git a/.gitignore b/.gitignore
index 737946d..f21716f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/tpm2.0-tools-2.1.0.tar.gz
-/gcc7-implict-fallthrough-fix.patch
-/allow-to-build-with-openssl-1.1.x.patch
+/tpm2-tools-3.0-rc1.tar.gz
diff --git a/sources b/sources
index 55b2b2f..b65cd7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tpm2-tools-2.1.1.tar.gz) = f376b6e77d5683746fcee622f603e396193718a3b0c4b57efc4969e489e8d221aba9dba4878d72f20d966434a9c20097bac33f42b9650e95bb7f03fe13dc2cda
+SHA512 (tpm2-tools-3.0-rc1.tar.gz) = d0cdf24f59ad0a9bcccae1a6d9fe41b4756b9c8affd5c8e817dc01ea8890ac67ace7f43f2d571221de7a6a5d3da204d779889b870823c2944e8d42d2d26d86ce
diff --git a/tpm2-tools.spec b/tpm2-tools.spec
index ca8b15c..825f463 100644
--- a/tpm2-tools.spec
+++ b/tpm2-tools.spec
@@ -1,14 +1,15 @@
 Name: tpm2-tools
-Version: 2.1.1
-Release: 1%{?dist}
+Version: 3.0
+Release: 0.1.rc1%{?dist}
 Summary: A TPM2.0 testing tool build upon TPM2.0-TSS
 
 License: BSD
-URL:     https://github.com/01org/tpm2-tools
-Source0: https://github.com/01org/tpm2-tools/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+URL:     https://github.com/intel/tpm2-tools
+Source0: https://github.com/intel/tpm2-tools/archive/%{version}-rc1/%{name}-%{version}-rc1.tar.gz
 
 BuildRequires: gcc-c++
 BuildRequires: libtool
+BuildRequires: pandoc
 BuildRequires: autoconf-archive
 BuildRequires: pkgconfig(cmocka)
 BuildRequires: pkgconfig(libcurl)
@@ -24,13 +25,16 @@ BuildRequires: pkgconfig(tcti-tabrmd)
 ExclusiveArch: %{ix86} x86_64
 
 # tpm2-tools is heavily depending on TPM2.0-TSS project, matched tss is required
-Requires: tpm2-tss%{?_isa} >= 1.1.0-1%{?dist} 
+Requires: tpm2-tss%{?_isa} >= 1.3.0-0.1.rc2%{?dist}
+
+# tpm2-tools project changed the install path for binaries and man page section
+Obsoletes: tpm2-tools <= 2.1.1-2
 
 %description
 tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}-rc1
 ./bootstrap
 
 %build
@@ -41,12 +45,17 @@ tpm2-tools is a batch of testing tools for tpm2.0. It is based on tpm2-tss.
 %make_install
 
 %files
-%doc README.md CHANGELOG 
+%doc README.md CHANGELOG.md
 %license LICENSE
-%{_sbindir}/tpm2_*
-%{_mandir}/man8/tpm2_*.8.gz
+%{_bindir}/tpm2_*
+%{_mandir}/man1/tpm2_*.1.gz
 
 %changelog
+* Wed Nov 29 2017 Javier Martinez Canillas <javierm@redhat.com> - 3.0-0.1.rc1
+- Update to 3.0 release candidate 1
+- Update URLs to point to the new project location
+- Make the package to obsolete version 2.1.1
+
 * Wed Nov 01 2017 Javier Martinez Canillas <javierm@redhat.com> - 2.1.1-1
 - Rename remaining tpm2.0-tools prefixes to tpm2-tools
 - Remove global pkg_prefix since now the upstream repo and package names match