From e3dc1632fd8521a76ea33cc1805680ca98b3440a Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 12 Oct 2010 15:54:13 -0600
Subject: [PATCH 1/2] support for openldap

---
 .gitignore         |  1 +
 389-adminutil.spec | 15 ++++++++-------
 sources            |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a788906..f250286 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 389-adminutil-1.1.10.tar.bz2
+/389-adminutil-1.1.11.tar.bz2
diff --git a/389-adminutil.spec b/389-adminutil.spec
index 98c17a5..6498851 100644
--- a/389-adminutil.spec
+++ b/389-adminutil.spec
@@ -1,15 +1,14 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
-Version:          1.1.10
-Release:          2%{?dist}
+Version:          1.1.11
+Release:          1%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
 Group:            Development/Libraries
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
-BuildRequires:    svrcore-devel
-BuildRequires:    mozldap-devel
+BuildRequires:    openldap-devel
 BuildRequires:    libicu-devel
 BuildRequires:    icu
 Provides:         adminutil = %{version}-%{release}
@@ -37,8 +36,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 Requires: nspr-devel
 Requires: nss-devel
-Requires: svrcore-devel
-Requires: mozldap-devel
+Requires: openldap-devel
 Requires: libicu-devel
 Provides:  adminutil-devel = %{version}-%{release}
 Obsoletes: adminutil-devel < 1.1.8-2
@@ -52,7 +50,7 @@ that use %{name}.
 
 %build
 
-%configure --disable-tests
+%configure --disable-tests --with-openldap
 %{__make} %{?_smp_mflags}
 
 %install
@@ -82,6 +80,9 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
+- with openldap support
+
 * Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> - 1.1.10-2
 - rebuild for icu 4.4
 
diff --git a/sources b/sources
index baae538..bc3c194 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e888430f0a82f1abedad5968fe84a434  389-adminutil-1.1.10.tar.bz2
+c772dc3fee1736798dd966ca847793d4  389-adminutil-1.1.11.tar.bz2

From 6c0f34fa2f71b2a2248bb6b7bd134a1369aa6714 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 19 Oct 2010 10:53:09 -0600
Subject: [PATCH 2/2] bump version to 1.1.12

---
 .gitignore         | 3 +--
 389-adminutil.spec | 5 ++++-
 sources            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index f250286..bcb7fb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-389-adminutil-1.1.10.tar.bz2
-/389-adminutil-1.1.11.tar.bz2
+389-adminutil-1.1.12.tar.bz2
diff --git a/389-adminutil.spec b/389-adminutil.spec
index 6498851..436a000 100644
--- a/389-adminutil.spec
+++ b/389-adminutil.spec
@@ -1,6 +1,6 @@
 Summary:          Utility library for 389 administration
 Name:             389-adminutil
-Version:          1.1.11
+Version:          1.1.12
 Release:          1%{?dist}
 License:          LGPLv2
 URL:              http://port389.org/wiki/AdminUtil
@@ -80,6 +80,9 @@ that use %{name}.
 %{_includedir}/libadmsslutil
 
 %changelog
+* Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-1
+- fix building with mozldap
+
 * Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
 - with openldap support
 
diff --git a/sources b/sources
index bc3c194..e3d9f30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c772dc3fee1736798dd966ca847793d4  389-adminutil-1.1.11.tar.bz2
+87fa5914b0582e209c0b2c1ce2e601b6  389-adminutil-1.1.12.tar.bz2