From e9d9d42ca2e40e89db7262f6c82cf9f69b7ba391 Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder@fedoraproject.org>
Date: Tue, 6 Apr 2010 19:12:46 +0000
Subject: [PATCH] Updated spec files for 1.1.11.a3 release.

---
 389-admin.spec | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/389-admin.spec b/389-admin.spec
index ff6c03f..954c1e1 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -1,6 +1,6 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .a2
+%global prerel .a3
 # also need the relprefix 0. field for a pre-release - also comment out for official release
 %global relprefix 0.
 
@@ -9,7 +9,7 @@
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.11
-Release:          %{?relprefix}2%{?prerel}%{?dist}
+Release:          %{?relprefix}3%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -37,6 +37,13 @@ BuildRequires:    389-ds-base-selinux-devel
 
 Requires:         389-ds-base
 Requires:         mod_nss
+
+# require our selinux subpackage
+Requires:         %{name}-selinux = %{version}-%{release}
+
+# this is needed for using semanage from our setup scripts
+Requires:         policycoreutils-python
+
 # the following are needed for some of our scripts
 Requires:         perl-Mozilla-LDAP
 Requires:         nss-tools
@@ -61,9 +68,15 @@ and CGI utilities used by the console.
 Summary:          SELinux policy for 389 Administration Server
 Group:            System Environment/Daemons
 Requires:         selinux-policy
-Requires:         %{name} = %{version}-%{release}
 Requires:         389-ds-base-selinux
 
+# this is needed to load and unload the policy module
+Requires(post):         policycoreutils
+Requires(post):         /sbin/service
+Requires(preun):        policycoreutils
+Requires(preun):        /sbin/service
+Requires(postun):       policycoreutils
+
 %description      selinux
 SELinux policy for the 389 Adminstration Server package.
 
@@ -229,6 +242,12 @@ fi
 %{_datadir}/selinux/*/%{pkgname}-admin.pp
 
 %changelog
+* Tue Apr  6 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.11-0.3.a3
+- 1.1.11.a3 release
+- Bug 570912 - dirsrv-admin SELinux module fails to install
+- Change parsing of start-slapd for instance name
+- Bug 574233 - Updated requirements for selinux subpackage
+
 * Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11.a2-0.2
 - the 1.1.11.a2 release
 - Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location