- Do not overuse macros.

- Removed unnecessary file requirements on chkconfig, ldconfig and service,
    now requiring the initscripts and chkconfig packages.
This commit is contained in:
Miloš Jakubíček 2009-05-14 13:53:25 +00:00
parent c42f485bb8
commit 4fbae55e69

View File

@ -1,37 +1,28 @@
Name: trousers
# RPM specfile for the trousers project on Fedora Summary: TCG's Software Stack v1.2
Version: 0.3.1
%define name trousers Release: 17%{?dist}
%define version 0.3.1 License: CPL
%define release 16 Group: System Environment/Libraries
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Name: %{name} Url: http://trousers.sourceforge.net
Summary: TCG's Software Stack v1.2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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)
BuildRequires: libtool, gtk2-devel, openssl-devel BuildRequires: libtool, gtk2-devel, openssl-devel
Requires(pre): shadow-utils 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 Patch0: trousers-0.3.1-remove-group-install-code.patch
Requires(preun): /sbin/service Patch1: trousers-0.3.1-limits.patch
Patch0: trousers-0.3.1-remove-group-install-code.patch Patch2: trousers-0.3.1-cast.patch
Patch1: trousers-0.3.1-limits.patch Patch3: trousers-0.3.1-module-ordering.patch
Patch2: trousers-0.3.1-cast.patch Patch4: trousers-0.3.1-workaround-selinux-namespace-pollution.patch
Patch3: trousers-0.3.1-module-ordering.patch Patch5: trousers-0.3.1-reuseaddr.patch
Patch4: trousers-0.3.1-workaround-selinux-namespace-pollution.patch Patch6: trousers-0.3.1-use-tpm-emu.patch
Patch5: trousers-0.3.1-reuseaddr.patch
Patch6: trousers-0.3.1-use-tpm-emu.patch
# Filed into upstream bugtracker at: # Filed into upstream bugtracker at:
# https://sourceforge.net/tracker/?func=detail&aid=2782253&group_id=126012&atid=704358 # 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 %description
TrouSerS is an implementation of the Trusted Computing Group's Software Stack 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 group tss >/dev/null || groupadd -g 59 -r tss
getent passwd tss >/dev/null || \ getent passwd tss >/dev/null || \
useradd -r -u 59 -g tss -d /dev/null -s /sbin/nologin \ 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 exit 0
%post %post
@ -106,7 +97,7 @@ fi
%postun %postun
/sbin/ldconfig /sbin/ldconfig
if [ $1 -gt 1 ]; then if [ $1 -gt 1 ]; then
/sbin/service tcsd condrestart &>/dev/null /sbin/service tcsd condrestart &>/dev/null || :
fi fi
%files %files
@ -135,6 +126,11 @@ fi
%{_libdir}/libtddl.a %{_libdir}/libtddl.a
%changelog %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 * 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). - Fix a typo in groupadd causing the %%pre scriptlet to fail (resolves BZ#486155).