From 551c9ef273feb8bec221577d3134aa58cb1bbfba Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Fri, 3 Oct 2014 11:45:58 -0400
Subject: [PATCH 1/3] Ticket 47917 - Fix Source location to use new wiki url

---
 389-admin-console.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/389-admin-console.spec b/389-admin-console.spec
index d253c0c..93631f0 100644
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -15,7 +15,7 @@ URL: http://port389.org
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source: http://port389.org/binaries/%{name}-%{version}.tar.bz2
 Requires: 389-admin
 BuildRequires: ant >= 1.6.2
 BuildRequires: ldapjdk

From 6053bf5924961e5cf569cfad4f9b53d86ce125c1 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed, 4 Feb 2015 17:30:36 -0800
Subject: [PATCH 2/3] bump version to 1.1.9

- Bug 886407 - Cannot restart SSL-admin server from console (#47477)
- Bug 966958 - Improve online help for Add CRL dialog (#47467)
- Bug 844764 - Directory Console generates insufficient key strength (#362)

(cherry picked from commit e378bd68e5b711800a5dd2472a4e5f6e7028c576)
(cherry picked from commit d70e236eb5ee084eee47f79946a43a08e5257192)

Conflicts:
	389-admin-console.spec
---
 .gitignore             |  1 +
 389-admin-console.spec | 10 ++++++++--
 sources                |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ec8040..58a561c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /389-admin-console-1.1.6.tar.bz2
 /389-admin-console-1.1.7.tar.bz2
 /389-admin-console-1.1.8.tar.bz2
+/389-admin-console-1.1.9.tar.bz2
diff --git a/389-admin-console.spec b/389-admin-console.spec
index 93631f0..5d9aaa4 100644
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -1,12 +1,12 @@
 %define major_version 1.1
-%define minor_version 8
+%define minor_version 9
 
 %define shortname 389-admin
 %define pkgname dirsrv
 
 Name: 389-admin-console
 Version: %{major_version}.%{minor_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 Summary: 389 Admin Server Management Console
 
 Group: Applications/System
@@ -87,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Wed Feb 04 2015 Noriko Hosoi <nhosoi@redhat.com> - 1.1.9-1
+- bump version to 1.1.9
+- Bug 886407 - Cannot restart SSL-admin server from console (#47477)
+- Bug 966958 - Improve online help for Add CRL dialog (#47467)
+- Bug 844764 - Directory Console generates insufficient key strength (#362)
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 2f77179..66d887d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7228ce57aa01fb8321a083f676de32f4  389-admin-console-1.1.8.tar.bz2
+5f2b8a660a0032665933a79a3a97794d  389-admin-console-1.1.9.tar.bz2

From abf078cb5a3af50dc579d6c245b8ac1b8181df57 Mon Sep 17 00:00:00 2001
From: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed, 11 Feb 2015 14:33:13 -0800
Subject: [PATCH 3/3] bump version to 1.1.10

- Bug 1022104 - Remove versioned jarfiles from _javadir (idm-console-framework)
---
 .gitignore             | 1 +
 389-admin-console.spec | 6 +++++-
 sources                | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58a561c..5a6c631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /389-admin-console-1.1.7.tar.bz2
 /389-admin-console-1.1.8.tar.bz2
 /389-admin-console-1.1.9.tar.bz2
+/389-admin-console-1.1.10.tar.bz2
diff --git a/389-admin-console.spec b/389-admin-console.spec
index 5d9aaa4..8f123c0 100644
--- a/389-admin-console.spec
+++ b/389-admin-console.spec
@@ -1,5 +1,5 @@
 %define major_version 1.1
-%define minor_version 9
+%define minor_version 10
 
 %define shortname 389-admin
 %define pkgname dirsrv
@@ -87,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html
 
 %changelog
+* Wed Feb 11 2015 Noriko Hosoi <nhosoi@redhat.com> - 1.1.10-1
+- bump version to 1.1.10
+- Bug 1022104 - Remove versioned jarfiles from _javadir (idm-console-framework)
+
 * Wed Feb 04 2015 Noriko Hosoi <nhosoi@redhat.com> - 1.1.9-1
 - bump version to 1.1.9
 - Bug 886407 - Cannot restart SSL-admin server from console (#47477)
diff --git a/sources b/sources
index 66d887d..b5b2a98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f2b8a660a0032665933a79a3a97794d  389-admin-console-1.1.9.tar.bz2
+d50d2ffa1cdcab9a8d6c8f9378266e3e  389-admin-console-1.1.10.tar.bz2