From 09b6542e9f42bd28f59d1f85148257ccf4142590 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Dec 10 2010 18:39:05 +0000
Subject: 1.2.7.4 release - git tag 389-ds-base-1.2.7.4


1.2.7.4 release - git tag 389-ds-base-1.2.7.4
Bug 661792 - Valid managed entry config rejected
(cherry picked from commit cb9c60600bdad0bfe24419f47580426b9e603f57)

forgot to update version in source
(cherry picked from commit 5992461d4eac1fd42a8463480cfa692e0bfd0ac4)
(cherry picked from commit 0fd063ba63dfb4e5e19586be3d7285cf354d2a52)
(cherry picked from commit b9dc713103ec7f97a62e9e5b58aa351471c3340b)

---

diff --git a/.gitignore b/.gitignore
index 709f34f..9d014bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *~
 /389-ds-base-1.2.7.2.tar.bz2
 /389-ds-base-1.2.7.3.tar.bz2
+/389-ds-base-1.2.7.4.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index cc2b3c0..128b06c 100644
--- a/389-ds-base-git-local.sh
+++ b/389-ds-base-git-local.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.7.3
+VERSION=1.2.7.4
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 #SRCNAME=$PKGNAME-$VERSION-$DATE
diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh
index 660443f..eb199c5 100644
--- a/389-ds-base-git.sh
+++ b/389-ds-base-git.sh
@@ -2,7 +2,7 @@
 
 DATE=`date +%Y%m%d`
 # use a real tag name here
-VERSION=1.2.7.3
+VERSION=1.2.7.4
 PKGNAME=389-ds-base
 TAG=${TAG:-$PKGNAME-$VERSION}
 URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"
diff --git a/389-ds-base.spec b/389-ds-base.spec
index abb7ece..c5a25d3 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -13,7 +13,7 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.7.3
+Version:          1.2.7.4
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
@@ -366,6 +366,10 @@ end
 %{_datadir}/%{pkgname}-selinux
 
 %changelog
+* Fri Dec 10 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.7.4-1
+- 1.2.7.4 release - git tag 389-ds-base-1.2.7.4
+- Bug 661792 - Valid managed entry config rejected
+
 * Wed Dec  8 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.7.3-1
 - 1.2.7.3 release - git tag 389-ds-base-1.2.7.3
 - Bug 658312 - Invalid free in Managed Entry plug-in
diff --git a/sources b/sources
index 2cba8a3..4cd0511 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1a8dde2fbdcf06007d52d2c6d7fe9c1  389-ds-base-1.2.7.3.tar.bz2
+9bfa9511c05f018acd5116a93ca1a81c  389-ds-base-1.2.7.4.tar.bz2