[389-admin/f14/master] fix Conflicts for selinux policy

Richard Allen Megginson rmeggins at fedoraproject.org
Tue Nov 30 00:04:04 UTC 2010


commit dc571e9d3625e3fd6d493a7fdd19b20c2f108983
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Mon Nov 29 17:01:46 2010 -0700

    fix Conflicts for selinux policy

 389-admin.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/389-admin.spec b/389-admin.spec
index c906e2b..4ec248c 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -7,7 +7,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.13
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -15,7 +15,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:         fedora-ds-admin = %{version}-%{release}
 Obsoletes:        fedora-ds-admin < 1.1.8-1
 Obsoletes:        %{name}-selinux
-Conflicts:        selinux-policy-base < 3.9.8
+Conflicts:        selinux-policy-base < 3.9.7-11
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -171,6 +171,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Mon Nov 29 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.13-2
+- fix Conflicts for selinux policy
+
 * Tue Nov 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.13-1
 - This is the final 1.1.13 release
 - git tag 389-admin-1.1.13


More information about the scm-commits mailing list