[389-ds-base/f13/mastera] put back some of the selinux requires that I nuked during a git merge :P

Richard Allen Megginson rmeggins at fedoraproject.org
Wed Sep 22 19:10:07 UTC 2010


commit ef116cf8aaa65ce3fcc3d018dba0578aa5b55f86
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Sep 22 13:07:48 2010 -0600

    put back some of the selinux requires that I nuked during a git merge :P

 389-ds-base.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/389-ds-base.spec b/389-ds-base.spec
index 8c06e87..66bb038 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -7,12 +7,12 @@
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
 #% global relprefix 0.
 
-%global selinux_variants strict targeted
+%global selinux_variants mls targeted
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
 Version:          1.2.6
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -47,10 +47,10 @@ BuildRequires:    /usr/share/selinux/devel/Makefile
 BuildRequires:    pam-devel
 
 # this is needed for using semanage from our setup scripts
-Requires:         policycoreutils
+Requires:         policycoreutils-python
 
 # these are needed for selinux
-Requires:         selinux-policy >= 2.4.6-203
+Requires:         selinux-policy
 Requires(post):   policycoreutils
 Requires(preun):  policycoreutils
 Requires(postun): policycoreutils
@@ -105,7 +105,6 @@ Development Libraries and headers for the 389 Directory Server base package.
 %package          selinux-devel
 Summary:          Development interface for 389 Directory Server base SELinux policy
 Group:            Development/Libraries
-Requires:         %{name} = %{version}-%{release}
 
 %description      selinux-devel
 SELinux policy interface for the 389 Directory Server base package.
@@ -348,6 +347,9 @@ end
 %{_datadir}/%{pkgname}-selinux
 
 %changelog
+* Wed Sep 22 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-2
+- put back some of the selinux requires that I nuked during a git merge :P
+
 * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-1
 - This is the final 1.2.6 release
 


More information about the scm-commits mailing list