From a097eb82c22079b72b9c40d53a01e6d34caef8156664dc4902f9af11cffa5e66 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Thu, 22 Feb 2018 10:49:01 +0000 Subject: [PATCH] - added version_fix.patch to fix package config version numbers. OBS-URL: https://build.opensuse.org/package/show/security/tpm2-0-tss?expand=0&rev=55 --- tpm2-0-tss.changes | 1 + tpm2-0-tss.spec | 9 +++++++++ version_fix.patch | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 version_fix.patch diff --git a/tpm2-0-tss.changes b/tpm2-0-tss.changes index b6c9fc5..26e99ba 100644 --- a/tpm2-0-tss.changes +++ b/tpm2-0-tss.changes @@ -7,6 +7,7 @@ Thu Feb 22 09:41:46 UTC 2018 - matthias.gerstner@suse.com - various stability bugfixes - EncryptDecrypt2 command is now implemented - removed reproducable.patch. This is now included upstream. +- added version_fix.patch to fix package config version numbers. ------------------------------------------------------------------- Fri Sep 1 14:27:33 UTC 2017 - matthias.gerstner@suse.com diff --git a/tpm2-0-tss.spec b/tpm2-0-tss.spec index 3ef9c84..a01530d 100644 --- a/tpm2-0-tss.spec +++ b/tpm2-0-tss.spec @@ -25,6 +25,7 @@ Group: Productivity/Security Url: https://github.com/tpm2-software/tpm2-tss Source0: https://github.com/tpm2-software/tpm2-tss/archive/%{version}.tar.gz Source2: baselibs.conf +Patch0: version_fix.patch # PATCH-FIX-UPSTREAM bmwiedemann https://github.com/01org/TPM2.0-TSS/pull/419 BuildRequires: autoconf-archive BuildRequires: automake @@ -82,6 +83,14 @@ TPM over a socket. %prep %setup -q -n tpm2-tss-%{version} +# TODO: XX: +# this fixes the autoconf version number which is determined via git and +# doesn't work in OBS. The distribution tarball may fix this in the future for +# us. If we don'T do this then the pkg-config *.pc files don't contain a +# version number and dependent packages like tpm2.0-tools fail to build. +# +# the version number needs to be fixed with each version change! +%patch0 -p1 %build # we are still using the source tarball here. there is a release tarball for diff --git a/version_fix.patch b/version_fix.patch new file mode 100644 index 0000000..c62fb79 --- /dev/null +++ b/version_fix.patch @@ -0,0 +1,11 @@ +Index: tpm2-tss-1.3.0/configure.ac +=================================================================== +--- tpm2-tss-1.3.0.orig/configure.ac ++++ tpm2-tss-1.3.0/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([tpm2-tss], +- [m4_esyscmd_s([git describe --tags --always --dirty])]) ++ [1.3.0]) + AC_CONFIG_MACRO_DIR([m4]) + AC_PROG_CC + AC_PROG_CXX