From 381f6a823ff1ed8de4d520dd785a3f4e604f7574 Mon Sep 17 00:00:00 2001
From: sgrubb <sgrubb@redhat.com>
Date: Thu, 15 May 2014 14:54:34 -0400
Subject: [PATCH] New upstream bug fix release

---
 .gitignore                     |  1 +
 sources                        |  2 +-
 trousers-0.3.11.2-constr.patch | 21 ---------------------
 trousers.spec                  |  9 +++++----
 4 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 trousers-0.3.11.2-constr.patch

diff --git a/.gitignore b/.gitignore
index a5c24d4..1440662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ trousers-0.3.4.tar.gz
 /trousers-0.3.9.tar.gz
 /trousers-0.3.10.tar.gz
 /trousers-0.3.11.2.tar.gz
+/trousers-0.3.13.tar.gz
diff --git a/sources b/sources
index 21c2b51..8ed3284 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab38dcb2811099dce379c64d43589f50  trousers-0.3.11.2.tar.gz
+562bb3d178ca91177aa2f6c2c1a83269  trousers-0.3.13.tar.gz
diff --git a/trousers-0.3.11.2-constr.patch b/trousers-0.3.11.2-constr.patch
deleted file mode 100644
index fa59d1f..0000000
--- a/trousers-0.3.11.2-constr.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur trousers-0.3.11.2/src/tspi/rpc/hosttable.c trousers-0.3.11.2.new/src/tspi/rpc/hosttable.c
---- trousers-0.3.11.2/src/tspi/rpc/hosttable.c	2013-07-12 18:27:37.000000000 +0200
-+++ trousers-0.3.11.2.new/src/tspi/rpc/hosttable.c	2014-02-28 12:13:25.763293218 +0100
-@@ -39,7 +39,7 @@
- #pragma init(_init)
- void _init(void)
- #else
--void __attribute__ ((constructor)) my_init(void)
-+static void __attribute__ ((constructor)) my_init(void)
- #endif
- {
- 	host_table_init();
-@@ -73,7 +72,7 @@
- #pragma fini(_fini)
- void _fini(void)
- #else
--void __attribute__ ((destructor)) my_fini(void)
-+static void __attribute__ ((destructor)) my_fini(void)
- #endif
- {
- 	host_table_final();
diff --git a/trousers.spec b/trousers.spec
index 91b70a0..4a17a58 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,14 +1,13 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
-Version: 0.3.11.2
-Release: 3%{?dist}
+Version: 0.3.13
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Libraries
 Url: http://trousers.sourceforge.net
 
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: tcsd.service
-Patch1: trousers-0.3.11.2-constr.patch
 
 BuildRequires: libtool, openssl-devel
 BuildRequires: systemd
@@ -46,7 +45,6 @@ applications.
 
 %prep
 %setup -q
-%patch1 -p1
 
 sed -i -e 's|/var/tpm|/var/lib/tpm|g' -e 's|/usr/local/var|/var|g' man/man5/tcsd.conf.5.in man/man8/tcsd.8.in
 
@@ -104,6 +102,9 @@ exit 0
 %{_libdir}/libtddl.a
 
 %changelog
+* Thu May 15 2014 Steve Grubb <sgrubb@redhat.com> 0.3.13-1
+- New upstream bug fix release
+
 * Tue Mar 18 2014 Steve Grubb <sgrubb@redhat.com> 0.3.11.2-3
 - Fix crash when linking libgnutls and libmysqlclient (#1069079)
 - Don't order tcsd after syslog.target (#1055198)