* Mon Jul 23 2007 Dan Walsh <dwalsh@redhat.com> 2.0.16-11

- Add checkpoliicy requires
- Fix fixfiles to report incorrect rpm
- Patch provided by Tony Nelson
This commit is contained in:
Daniel J Walsh 2007-07-23 14:31:19 +00:00
parent 1fc684e8a0
commit cefb6e95e5
2 changed files with 18 additions and 2 deletions

View File

@ -135,6 +135,17 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po
new_serange = "%s-%s" % (serange[0], top[0])
if add_ind:
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.16/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2007-05-04 09:14:49.000000000 -0400
+++ policycoreutils-2.0.16/scripts/fixfiles 2007-07-23 10:29:53.000000000 -0400
@@ -108,6 +108,7 @@
rpmlist() {
rpm -q --qf '[%{FILESTATES} %{FILENAMES}\n]' "$1" | grep '^0 ' | cut -f2- -d ' '
+[ ${PIPESTATUS[0]} != 0 ] && echo "$1 not found" >/dev/stderr
}
#
diff --exclude-from=exclude --exclude=sepolgen-1.0.8 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-2.0.16/scripts/genhomedircon
--- nsapolicycoreutils/scripts/genhomedircon 2007-05-04 09:14:49.000000000 -0400
+++ policycoreutils-2.0.16/scripts/genhomedircon 2007-07-06 09:48:36.000000000 -0400

View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities.
Name: policycoreutils
Version: 2.0.16
Release: 10%{?dist}
Release: 11%{?dist}
License: GPL
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -22,7 +22,7 @@ Patch3: policycoreutils-gui.patch
BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} libcap-devel audit-libs-devel >= %{libauditver} gettext
Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff /bin/rpm /bin/sed
Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >= %{libauditver}
Requires: libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} libselinux-python coreutils audit-libs-python >= %{libauditver} checkpolicy
Requires(post): /sbin/service /sbin/chkconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -192,6 +192,11 @@ if [ "$1" -ge "1" ]; then
fi
%changelog
* Mon Jul 23 2007 Dan Walsh <dwalsh@redhat.com> 2.0.16-11
- Add checkpoliicy requires
- Fix fixfiles to report incorrect rpm
- Patch provided by Tony Nelson
* Fri Jul 7 2007 Dan Walsh <dwalsh@redhat.com> 2.0.16-10
- Fix checking for conflicting directory specification in genhomedircon