[389-admin/el5] skip rebranding current brand - support for skins

[Richard Allen Megginson]

commit 67446e0c97ae917bc2c5e81ad235e54ec4a45be9
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Jun 21 15:39:33 2011 -0600

    skip rebranding current brand - support for skins
    
    skip rebranding current brand - support for skins
    (cherry picked from commit 4687d68e49201f81094deedd99792fd4dda5725d)
    (cherry picked from commit 5fe2312f29763c869b9fd1c38a36632636b60016)
    (cherry picked from commit 55fa49d238f8d49d9f2b41cdc98a6e85156969eb)
    (cherry picked from commit 11ac61dc9fe37419747bb082df37f1c9d788a9a7)

 .gitignore             |    1 +
 389-admin-git-local.sh |    2 +-
 389-admin-git.sh       |    2 +-
 389-admin.spec         |    6 +++++-
 sources                |    2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d474e3b..789171f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /389-admin-1.1.15.tar.bz2
 /389-admin-1.1.16.tar.bz2
 /389-admin-1.1.17.tar.bz2
+/389-admin-1.1.18.tar.bz2
diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh
index 06317f9..7a472de 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.17
+VERSION=1.1.18
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
diff --git a/389-admin-git.sh b/389-admin-git.sh
index 31f2541..e5bec9b 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.17
+VERSION=1.1.18
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION
diff --git a/389-admin.spec b/389-admin.spec
index 6f6808b..9ffbff1 100644
--- a/389-admin.spec
+++ b/389-admin.spec
@@ -8,7 +8,7 @@
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.17
+Version:          1.1.18
 Release:          %{?relprefix}1%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
@@ -217,6 +217,10 @@ end
 %{_mandir}/man8/*
 
 %changelog
+* Tue Jun 21 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.18-1
+- skip rebranding current brand
+- support for skins
+
 * Fri May 13 2011 Rich Megginson <rmeggins at redhat.com> - 1.1.17-1
 - 1.1.17
 - support "in-place" upgrade and rebranding from Red Hat to 389
diff --git a/sources b/sources
index 921ca09..f69b53c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4d8db9be619f4dbfcaafe46fe6e10fb  389-admin-1.1.17.tar.bz2
+82ae2ada4f6c03d70f21e3254aad5cf3  389-admin-1.1.18.tar.bz2