From 7d09ecae40bd6f2fd64e60f11050856e25572358 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 13 Feb 2014 08:30:25 +0000
Subject: [PATCH] Minor spec cleanups

---
 trousers.spec | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/trousers.spec b/trousers.spec
index 164c83d..45ae1fc 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,15 +1,16 @@
 Name: trousers
 Summary: TCG's Software Stack v1.2
 Version: 0.3.11.2
-Release: 1%{?dist}
+Release: 2%{?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
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildRequires: libtool, openssl-devel
-BuildRequires: systemd-units
+BuildRequires: systemd
 Requires(pre): shadow-utils
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -53,16 +54,12 @@ sed -i -e 's|/var/tpm|/var/lib/tpm|g' -e 's|/usr/local/var|/var|g' man/man5/tcsd
 make -k %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}/%{_localstatedir}/lib/tpm
 make install DESTDIR=${RPM_BUILD_ROOT} INSTALL="install -p"
 rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libtspi.la
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 %pre
 getent group tss >/dev/null || groupadd -g 59 -r tss
 getent passwd tss >/dev/null || \
@@ -82,7 +79,6 @@ exit 0
 /sbin/ldconfig
 
 %files
-%defattr(-, root, root, -)
 %doc README LICENSE ChangeLog
 %{_sbindir}/tcsd
 %{_libdir}/libtspi.so.?
@@ -95,7 +91,6 @@ exit 0
 
 %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/
@@ -103,11 +98,13 @@ exit 0
 %doc %{_mandir}/man3/Tspi_*
 
 %files static
-%defattr(-, root, root, -)
 # The only static library shipped by trousers, the TDDL
 %{_libdir}/libtddl.a
 
 %changelog
+* Thu Feb 13 2014 Peter Robinson <pbrobinson@fedoraproject.org> 0.3.11.2-2
+- Minor spec cleanups
+
 * Mon Aug 19 2013 Steve Grubb <sgrubb@redhat.com> 0.3.11.2-1
 - New upstream bug fix and license change release