From f27ddf803d9962ad6ef4869e2fd5169e3e68459f Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Nov 29 2017 00:38:16 +0000 Subject: Update to 1.3.0 release candidate 2 This commit updates tpm2-tss to version 1.3.0-rc2. It also does some cleanups to the package such as using the latest URL for the project repository, removing an unneeded global prefix and remove a compiler flag that's no longer needed. resolves: rhbz#1508870 Signed-off-by: Javier Martinez Canillas --- diff --git a/.gitignore b/.gitignore index 88e00f5..053f52b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/tpm2-tss-1.2.0.tar.gz +/tpm2-tss-1.3.0-rc2.tar.gz diff --git a/add-license-file.patch b/add-license-file.patch new file mode 100644 index 0000000..673e89e --- /dev/null +++ b/add-license-file.patch @@ -0,0 +1,30 @@ +diff --git a/LICENSE b/LICENSE +new file mode 100644 +index 000000000000..3ea3e34afad0 +--- /dev/null ++++ b/LICENSE +@@ -0,0 +1,21 @@ ++Redistribution and use in source and binary forms, with or without ++modification, are permitted provided that the following conditions are met: ++ ++1. Redistributions of source code must retain the above copyright notice, ++this list of conditions and the following disclaimer. ++ ++2. Redistributions in binary form must reproduce the above copyright notice, ++this list of conditions and the following disclaimer in the documentation ++and/or other materials provided with the distribution. ++ ++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE ++LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF ++THE POSSIBILITY OF SUCH DAMAGE. +-- +2.14.3 + diff --git a/sources b/sources index 93be4cb..9af142f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tpm2-tss-1.2.0.tar.gz) = 774be89e849ff7ec7bdd8aa68ea86f6662e4a22571c7f5e8b2ae63073b7645e04eec4bd41104340fde618577a4e263dfb8e636e31a73bf1eb37b965b052c6179 +SHA512 (tpm2-tss-1.3.0-rc2.tar.gz) = 8e0537e87ecd76944768cd1dc15035d0829bf2d153d0792d603d8af4c6cfe55341dfa10c4072b34624dd46a6d4c3c4ddb73543946806604e6a91b645d9cca39b diff --git a/tpm2-tss.spec b/tpm2-tss.spec index 3745d8a..6cab9e0 100644 --- a/tpm2-tss.spec +++ b/tpm2-tss.spec @@ -1,15 +1,16 @@ Name: tpm2-tss -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.0 +Release: 0.1.rc2%{?dist} Summary: TPM2.0 Software Stack -%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-tss -Source0: https://github.com/01org/tpm2-tss/archive/%{version}.tar.gz#/%{pkg_prefix}-%{version}.tar.gz +URL: https://github.com/intel/tpm2-tss +Source0: https://github.com/intel/tpm2-tss/archive/%{version}-rc2/%{name}-%{version}-rc2.tar.gz + +# https://github.com/intel/tpm2-tss/pull/646 +Patch0: add-license-file.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -27,13 +28,10 @@ APIs. It sits between TPM driver and applications, providing TPM2.0 specified APIs for applications to access TPM module through kernel TPM drivers. %prep -%autosetup -n %{pkg_prefix}-%{version} -./bootstrap - +%autosetup -n %{name}-%{version}-rc2 %build -# 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 +%configure --disable-static --disable-silent-rules %make_build %install @@ -41,7 +39,6 @@ APIs for applications to access TPM module through kernel TPM drivers. find %{buildroot}%{_libdir} -type f -name \*.la -delete %files -%doc README.md CHANGELOG.md %license LICENSE %{_libdir}/libsapi.so.* %{_libdir}/libtcti-device.so.* @@ -73,6 +70,14 @@ use tpm2-tss. %postun -p /sbin/ldconfig %changelog +* Wed Nov 29 2017 Javier Martinez Canillas - 1.3.0-0.1.rc2 +- Update to 1.3.0 release candidate 2 (RHBZ#1508870) +- Remove global pkg_prefix since now the upstream repo and package names match +- Update URLs to point to the new project location +- Remove -Wno-int-in-bool-context compiler flag since now upstream takes care +- Remove %doc directive since README.md and CHANGELOG.md are not in the tarball +- Add patch to include a LICENSE since the generated tarball does not have it + * Mon Aug 28 2017 Javier Martinez Canillas - 1.2.0-1 - Update to 1.2.0 release - Use tpm2-tss instead of TPM2.0-TSS as prefix since project name changed