[389-ds-base/f15] The 1.2.10.0 release - some minor bug fixes

[Richard Allen Megginson]

commit 9939b1a2c509a8ce7499d43ee5ffe5eb797f075a
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Mon Feb 13 12:56:00 2012 -0700

    The 1.2.10.0 release - some minor bug fixes
    
    - Ticket 284 - Remove unnecessary SNMP MIB files
    - Ticket 51 - memory leaks in 389-ds-base-1.2.8.2-1.el5?
    - Ticket 175 - logconv.pl improvements
    (cherry picked from commit f830d946a399370f79324ab5134d49373d4d515a)

 .gitignore               |    1 +
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |   13 +++++++++----
 sources                  |    2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e06b86d..a81cea5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@
 /389-ds-base-1.2.10.a7.tar.bz2
 /389-ds-base-1.2.10.a8.tar.bz2
 /389-ds-base-1.2.10.rc1.tar.bz2
+/389-ds-base-1.2.10.0.tar.bz2
diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh
index 9da8c9e..8f68749 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.10.rc1
+VERSION=1.2.10.0
 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 b523b0d..a97da4f 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.10.rc1
+VERSION=1.2.10.0
 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 fcb7ed7..e353f2b 100644
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@ -3,9 +3,9 @@
 # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
 # also remove the space between % and global - this space is needed because
 # fedpkg verrel stupidly ignores comment lines
-%global prerel .rc1
+# % global prerel .rc1
 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
-%global relprefix 0.
+# % global relprefix 0.
 
 %global use_openldap 1
 
@@ -15,8 +15,8 @@
 
 Summary:          389 Directory Server (base)
 Name:             389-ds-base
-Version:          1.2.10
-Release:          %{?relprefix}10%{?prerel}%{?dist}
+Version:          1.2.10.0
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 with exceptions
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -276,6 +276,11 @@ exit 0
 %{_libdir}/%{pkgname}/libslapd.so.*
 
 %changelog
+* Mon Feb 13 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.10.0-1
+- Ticket 284 - Remove unnecessary SNMP MIB files
+- Ticket 51 - memory leaks in 389-ds-base-1.2.8.2-1.el5?
+- Ticket 175 - logconv.pl improvements
+
 * Thu Feb  2 2012 Rich Megginson <rmeggins at redhat.com> - 1.2.10-0.10.rc1
 - ad9dd30 coverity 12488 Resource leak In attr_index_config(): Leak of memory or pointers to system resources
 - Ticket #281 - TLS not working with latest openldap
diff --git a/sources b/sources
index d6f545f..a1a58a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8465e59a6b54717c4ff8ea028083cd31  389-ds-base-1.2.10.rc1.tar.bz2
+936afee1da4e49e636696577c5cf1dd8  389-ds-base-1.2.10.0.tar.bz2