From 6d63fa700e54325e02f04614859c507d2d1331a2 Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder@redhat.com>
Date: Nov 18 2010 18:50:51 +0000
Subject: Corrected selinux conflict version


---

diff --git a/389-admin.spec b/389-admin.spec
index e744683..9addc4c 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -7,7 +7,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.12
-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.7-13
+Conflicts:        selinux-policy-base < 3.9.7-11
 
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -171,9 +171,12 @@ end
 %{_mandir}/man8/*
 
 %changelog
-* Fri Nov 12 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.1.12-1
+* Thu Nov 18 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.12-2
 - This is the final 1.1.12 release
 - git tag 389-admin-1.1.12
+- Corrected conflict version for selinux-policy
+
+* Fri Nov 12 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.12-1
 - Bug 648949 - Merge dirsrv and dirsrv-admin policy modules into base policy
 
 * Tue Oct 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-0.2.a2