[trousers] New upstream bug fix release

[Steve Grubb]

commit 554d8fb3a45b429cfc2024741d1450142230b190
Author: Steve <sgrubb at redhat.com>
Date:   Fri Apr 8 09:26:06 2011 -0400

    New upstream bug fix release

 .gitignore    |    1 +
 sources       |    2 +-
 trousers.spec |   15 ++++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96af01f..4458ea0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 trousers-0.3.1.tar.gz
 trousers-0.3.4.tar.gz
+/trousers-0.3.6.tar.gz
diff --git a/sources b/sources
index eaa16a7..ee731a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72235fd6d2bb35b898a654429946f2e6  trousers-0.3.4.tar.gz
+f4609e6446099e1403e23bb671df87f4  trousers-0.3.6.tar.gz
diff --git a/trousers.spec b/trousers.spec
index 4afaae9..7e39abe 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,15 +1,13 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
-Version: 0.3.4
-Release: 5%{?dist}
+Version: 0.3.6
+Release: 1%{?dist}
 License: CPL
 Group: System Environment/Libraries
 Url: http://trousers.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Patch from upstream cleaning up some use of free() 
-Patch1: trousers-0.3.4-free.patch
 # Patch init script to conform to our guidelines
-Patch2: trousers-init.patch
+Patch1: trousers-init.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool, openssl-devel
 Requires(pre): shadow-utils
@@ -47,8 +45,7 @@ applications.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2
+%patch1 -p0
 
 %build
 # fix man page paths
@@ -105,6 +102,7 @@ fi
 %files devel
 # The files to be used by developers, 'trousers-devel'
 %defattr(-, root, root, -)
+%doc doc/LTC-TSS_LLD_08_r2.pdf doc/TSS_programming_SNAFUs.txt
 %attr(0755, root, root) %{_libdir}/libtspi.so
 %{_includedir}/tss/
 %{_includedir}/trousers/
@@ -116,6 +114,9 @@ fi
 %{_libdir}/libtddl.a
 
 %changelog
+* Fri Apr 08 2011 Steve Grubb <sgrubb at redhat.com> 0.3.6-1
+- New upstream bug fix release
+
 * Thu Feb 10 2011 Miloš Jakubíček <xjakub at fi.muni.cz> - 0.3.4-5
 - Fix paths in man pages, mark them as %%doc -- fix BZ#676394