From ad87cadbe30a9bd01f05a676b87ab560034473f7 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Aug 04 2010 17:26:52 +0000
Subject: Merge branch 'master' into el6


Conflicts:

	.gitignore
	389-admin-git-local.sh
	389-admin-git.sh
	389-admin.spec
	sources

---

diff --git a/.gitignore b/.gitignore
index bc5278c..079ac02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-389-admin-1.1.11.rc1.tar.bz2
+389-admin-1.1.11.rc2.tar.bz2
+*~
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 0e3bcb5..a3c3935 100755
--- a/389-admin-git-local.sh
+++ b/389-admin-git-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11.rc1
+VERSION=1.1.11.rc2
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index e06144b..368760a 100755
--- a/389-admin-git.sh
+++ b/389-admin-git.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11.rc1
+VERSION=1.1.11.rc2
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index d02813e..8f8fd5b 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 .rc1
+%global prerel .rc2
 # 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}5%{?prerel}%{?dist}
+Release:          %{?relprefix}6%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -217,6 +217,11 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Wed Aug  4 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.6.rc2
+- 1.1.11.rc2 release
+- git tag 389-admin-1.1.11.rc2
+- Bug 594745 - Get rid of dirsrv_lib_t label
+
 * Wed Jun  9 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.5.rc1
 - 1.1.11.rc1 release
 
@@ -230,6 +235,9 @@ end
 - Bug 574233 - Updated requirements for selinux policy
 - Moved selinux subpackage into base package
 
+* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> - 1.1.11.a2-0.3
+- rebuild for icu 4.4
+
 * 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
diff --git a/sources b/sources
index dbbfb93..377b04c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc80b47ce1e5bd39d8e5632dd359d1df  389-admin-1.1.11.rc1.tar.bz2
+b766fc81b26d92172115004499b3fe8d  389-admin-1.1.11.rc2.tar.bz2