Merge branch 'master' into el5

Conflicts:

	389-admin.spec

.gitignore

@@ -1,2 +1,2 @@
-389-admin-1.1.11.rc2.tar.bz2
 *~
+/389-admin-1.1.11.tar.bz2

389-admin-git-local.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11.rc2
+VERSION=1.1.11
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}

389-admin-git.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11.rc2
+VERSION=1.1.11
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION

389-admin.spec

@@ -1,15 +1,15 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-%global prerel .rc2
+# % global prerel .rc2
 # also need the relprefix 0. field for a pre-release - also comment out for official release
-%global relprefix 0.
+# % global relprefix 0.
 
 %global selinux_variants strict targeted
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
 Version:          1.1.11
-Release:          %{?relprefix}6%{?prerel}%{?dist}
+Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -219,6 +219,9 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Thu Aug 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
+- This is the final 1.1.11 release
+
 * 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

sources

@@ -1 +1 @@
-b766fc81b26d92172115004499b3fe8d  389-admin-1.1.11.rc2.tar.bz2
+3301554c3cd9cb26216a43c037695559  389-admin-1.1.11.tar.bz2