From 4fbae55e69d45b7316c7b13fe1b6949196ede93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?=
 <mjakubicek@fedoraproject.org>
Date: Thu, 14 May 2009 13:53:25 +0000
Subject: [PATCH] - Do not overuse macros. - Removed unnecessary file
 requirements on chkconfig, ldconfig and service,     now requiring the
 initscripts and chkconfig packages.

---
 trousers.spec | 60 ++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/trousers.spec b/trousers.spec
index 44d4781..38416ce 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -1,37 +1,28 @@
-
-# RPM specfile for the trousers project on Fedora
-
-%define name		trousers
-%define version		0.3.1
-%define release		16
-
-Name:			%{name}
-Summary:		TCG's Software Stack v1.2 
-Version:		%{version}
-Release:		%{release}%{?dist}
-License:		CPL
-Group:			System Environment/Libraries
-Source0:		http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Url:			http://trousers.sourceforge.net
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:				trousers
+Summary:			TCG's Software Stack v1.2 
+Version:			0.3.1
+Release:			17%{?dist}
+License:			CPL
+Group:				System Environment/Libraries
+Source0:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Url:				http://trousers.sourceforge.net
+BuildRoot:			%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:		libtool, gtk2-devel, openssl-devel
 Requires(pre):		shadow-utils
-Requires(post):		/sbin/ldconfig
-Requires(post):		/sbin/chkconfig
-Requires(postun):	/sbin/ldconfig
-Requires(postun):	/sbin/service
-Requires(preun):	/sbin/chkconfig
-Requires(preun):	/sbin/service
-Patch0:			trousers-0.3.1-remove-group-install-code.patch
-Patch1:			trousers-0.3.1-limits.patch
-Patch2:			trousers-0.3.1-cast.patch
-Patch3:			trousers-0.3.1-module-ordering.patch
-Patch4:			trousers-0.3.1-workaround-selinux-namespace-pollution.patch
-Patch5:			trousers-0.3.1-reuseaddr.patch
-Patch6:			trousers-0.3.1-use-tpm-emu.patch
+Requires(post):		chkconfig
+Requires(preun):	chkconfig
+Requires(preun):	initscripts
+Requires(postun):	initscripts
+Patch0:				trousers-0.3.1-remove-group-install-code.patch
+Patch1:				trousers-0.3.1-limits.patch
+Patch2:				trousers-0.3.1-cast.patch
+Patch3:				trousers-0.3.1-module-ordering.patch
+Patch4:				trousers-0.3.1-workaround-selinux-namespace-pollution.patch
+Patch5:				trousers-0.3.1-reuseaddr.patch
+Patch6:				trousers-0.3.1-use-tpm-emu.patch
 # Filed into upstream bugtracker at:
 # https://sourceforge.net/tracker/?func=detail&aid=2782253&group_id=126012&atid=704358
-Patch7:			trousers-0.3.1-gcc44.patch
+Patch7:				trousers-0.3.1-gcc44.patch
 
 %description
 TrouSerS is an implementation of the Trusted Computing Group's Software Stack
@@ -90,7 +81,7 @@ rm -rf ${RPM_BUILD_ROOT}
 getent group tss >/dev/null || groupadd -g 59 -r tss
 getent passwd tss >/dev/null || \
 useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \
-        -c "Account used by the trousers package to sandbox the tcsd daemon" tss
+ -c "Account used by the trousers package to sandbox the tcsd daemon" tss
 exit 0
 
 %post
@@ -106,7 +97,7 @@ fi
 %postun
 /sbin/ldconfig
 if [ $1 -gt 1 ]; then
-	/sbin/service tcsd condrestart &>/dev/null
+	/sbin/service tcsd condrestart &>/dev/null || :
 fi
 
 %files
@@ -135,6 +126,11 @@ fi
 %{_libdir}/libtddl.a
 
 %changelog
+* Thu May 14 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0.3.1-17
+- Do not overuse macros.
+- Removed unnecessary file requirements on chkconfig, ldconfig and service,
+  now requiring the initscripts and chkconfig packages.
+
 * Wed May 06 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 0.3.1-16
 - Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155).