rpms/trousers/F-10 trousers.spec,1.12,1.13
Miloš Jakubíček
mjakubicek at fedoraproject.org
Thu May 14 21:00:25 UTC 2009
Author: mjakubicek
Update of /cvs/pkgs/rpms/trousers/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17808
Modified Files:
trousers.spec
Log Message:
- Do not overuse macros.
- Removed unnecessary file requirements on chkconfig, ldconfig and service,
now requiring the initscripts and chkconfig packages.
Index: trousers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trousers/F-10/trousers.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- trousers.spec 6 May 2009 21:55:58 -0000 1.12
+++ trousers.spec 14 May 2009 20:59:54 -0000 1.13
@@ -1,34 +1,25 @@
-
-# RPM specfile for the trousers project on Fedora
-
-%define name trousers
-%define version 0.3.1
-%define release 13
-
-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: 14%{?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
%description
TrouSerS is an implementation of the Trusted Computing Group's Software Stack
@@ -86,7 +77,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
@@ -102,7 +93,7 @@ fi
%postun
/sbin/ldconfig
if [ $1 -gt 1 ]; then
- /sbin/service tcsd condrestart &>/dev/null
+ /sbin/service tcsd condrestart &>/dev/null || :
fi
%files
@@ -131,6 +122,11 @@ fi
%{_libdir}/libtddl.a
%changelog
+* Thu May 14 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.3.1-14
+- 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 at fi.muni.cz> - 0.3.1-13
- Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155).
More information about the fedora-extras-commits
mailing list