* Fri Aug 21 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.0.71-9

- Don't try to remove restorecond after last erase (done already in %preun).
- Ensure scriptlets exit with status 0.
- Fix %post and %pr
This commit is contained in:
Daniel J Walsh 2009-08-21 19:30:00 +00:00
parent 7c396f5fa5
commit f6cc437735

View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.71 Version: 2.0.71
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -29,7 +29,8 @@ BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >=
BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel BuildRequires: desktop-file-utils dbus-devel dbus-glib-devel
Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed
Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver} Requires: libsepol >= %{libsepolver} coreutils checkpolicy libselinux-utils >= %{libselinuxver}
Requires(post): /sbin/service /sbin/chkconfig Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service /sbin/chkconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description %description
@ -251,6 +252,7 @@ if [ $1 -eq 0 ]; then
/sbin/service restorecond stop > /dev/null 2>&1 /sbin/service restorecond stop > /dev/null 2>&1
/sbin/chkconfig --del restorecond /sbin/chkconfig --del restorecond
fi fi
exit 0
%post %post
/sbin/chkconfig --add restorecond /sbin/chkconfig --add restorecond
@ -259,12 +261,15 @@ exit 0
%postun %postun
if [ "$1" -ge "1" ]; then if [ "$1" -ge "1" ]; then
[ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null [ -x /sbin/service ] && /sbin/service restorecond condrestart > /dev/null
else
[ -x /sbin/service ] && /sbin/service restorecond stop > /dev/null
/sbin/chkconfig --del restorecond
fi fi
exit 0
%changelog %changelog
* Fri Aug 21 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.0.71-9
- Don't try to remove restorecond after last erase (done already in %%preun).
- Ensure scriptlets exit with status 0.
- Fix %%post and %%pr
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.0.71-8 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.0.71-8
- rebuilt with new audit - rebuilt with new audit