- Do not overuse macros.

- Removed unnecessary file requirements on chkconfig, ldconfig and service,
    now requiring the initscripts and chkconfig packages.

trousers.spec

@@ -1,14 +1,7 @@
-
+Name:				trousers
-# 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}
+Version:			0.3.1
-Release:		%{release}%{?dist}
+Release:			17%{?dist}
 License:			CPL
 Group:				System Environment/Libraries
 Source0:			http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -16,12 +9,10 @@ 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):		chkconfig
-Requires(post):		/sbin/chkconfig
+Requires(preun):	chkconfig
-Requires(postun):	/sbin/ldconfig
+Requires(preun):	initscripts
-Requires(postun):	/sbin/service
+Requires(postun):	initscripts
-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
@@ -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).