diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 6636d52..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-389-ds-console-1.2.0.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5ed7b47
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+389-ds-console-1.2.3.tar.bz2
+/389-ds-console-1.2.4.tar.bz2
+/389-ds-console-1.2.5.tar.bz2
+/389-ds-console-1.2.6.tar.bz2
+/389-ds-console-1.2.12.tar.bz2
diff --git a/0001-Bug-1234441-Security-info-from-Help-should-be-remove.patch b/0001-Bug-1234441-Security-info-from-Help-should-be-remove.patch
new file mode 100644
index 0000000..9b05494
--- /dev/null
+++ b/0001-Bug-1234441-Security-info-from-Help-should-be-remove.patch
@@ -0,0 +1,30 @@
+From baba5abe115a8f78224d820b4d6abda1c3aca397 Mon Sep 17 00:00:00 2001
+From: Noriko Hosoi
+Date: Wed, 27 Apr 2016 15:28:56 -0700
+Subject: [PATCH] Bug 1234441 - Security info from Help should be removed
+
+File: help/en/help/statustab_general.html
+Removed: Security level. Indicates whether the server uses domestic
+(US based, 128-bit ciphers) or export (non-US based, 40-bit ciphers)
+encryption levels.
+---
+ help/en/help/statustab_general.html | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/help/en/help/statustab_general.html b/help/en/help/statustab_general.html
+index 05bf753..2a47561 100644
+--- a/help/en/help/statustab_general.html
++++ b/help/en/help/statustab_general.html
+@@ -39,9 +39,5 @@ Use this panel to view current server information. You cannot use this panel to
+
+
+
+-Security level. Indicates whether the server uses domestic (US based, 128-bit ciphers) or export (non-US based, 40-bit ciphers) encryption levels.
+-
+-
+-
+ Server status. Indicates whether the server is on or off.
+
+--
+2.4.3
+
diff --git a/389-ds-console.spec b/389-ds-console.spec
index 0c0b99d..471cdfa 100644
--- a/389-ds-console.spec
+++ b/389-ds-console.spec
@@ -1,28 +1,33 @@
%define major_version 1.2
-%define minor_version 0
+%define minor_version 12
%define shortname 389-ds
%define pkgname dirsrv
Name: 389-ds-console
Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 2%{?dist}
Summary: 389 Directory Server Management Console
Group: Applications/System
License: GPLv2
-URL: http://port389.org
+URL: https://port389.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Source: http://port389.org/sources/%{name}-%{version}.tar.bz2
+Source: https://port389.org/binaries/%{name}-%{version}.tar.bz2
+Patch0: 0001-Bug-1234441-Security-info-from-Help-should-be-remove.patch
+
Requires: 389-admin
+Requires: java >= 1.8.0
BuildRequires: ant >= 1.6.2
BuildRequires: ldapjdk
BuildRequires: idm-console-framework >= 1.1
-BuildRequires: java-devel >= 1:1.6.0
-Provides: fedora-ds-console = %{version}-%{release}
-Obsoletes: fedora-ds-console < 1.2.0-3
+BuildRequires: java-devel >= 1.8.0
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
+
%description
A Java based remote management console used for managing 389
@@ -39,6 +44,7 @@ Web docs for 389 Directory Server Management Console
%prep
%setup -q
+%patch0 -p1
%build
%{ant} \
@@ -83,6 +89,63 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/%{pkgname}/manual/en/slapd/help/*.html
%changelog
+* Fri Jul 15 2016 Noriko Hosoi 1.2.12-1
+- Release 1.2.12-2
+
+* Fri Jul 15 2016 Noriko Hosoi 1.2.12-1
+- Release 1.2.12-1
+- Console -- Update Java dependency to 1.8
+- Ticket 48417 - Security info from Help should be removed (partial)
+- Ticket 48139 - drop support for legacy replication
+- Ticket 48130 - Add "+all" and "-TLS_RSA_WITH_AES_128_GCM_SHA256" to Console Cipher Preference for TLS
+- Ticket 47994 - DS Console always sets nsSSL3 to "on" when a securty setting is adjusted
+- Ticket 47380 - RFE: Winsync loses connection with AD objects when they move from the console.
+- Ticket 135 - DS console - right clicking an object does not select that object
+- Ticket 47887 - DS Console does not correctly disable SSL
+- Ticket 47485 - DS instance cannot be restored from remote console
+- Ticket 47886 - DS Console - mouse wheel speed very slow
+- Ticket 176 - DS Console should timeout when mismatched port and protocol combination is chosen
+- Ticket 47883 - DS Console - java exception when refreshing schema
+- Ticket 96 - Window too large for Manage password policy
+- Ticket 370 - Opening merge qualifier CoS entry using RHDS console changes the entry
+
+* Fri Jun 17 2011 Rich Megginson 1.2.6-1
+- git tag 389-ds-console-1.2.6
+- added skins support
+- Bug 700908 - Validate matching rules when creating a new attribute
+- Bug 705753 - Refresh problem in Console directory browser
+
+* Wed Mar 30 2011 Rich Megginson 1.2.5-1
+- the 1.2.5 release - git tag 389-ds-console-1.2.5
+- Bug 616707 - Add attribute matching rule UI to Console
+- Bug 533505 - Warn about CA cert trust when enabling SSL in Console
+- Bug 158262 - Windows Sync UI is inconistent
+- Bug 504803 - Allow nsslapd-*-logmaxdiskspace to be set to -1 in UI
+- Bug 474113 - Allow access log level to be configured from Console
+- Bug 229693 - Update naming attribute when objectclass is removed
+- Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc)
+
+* Wed Feb 23 2011 Rich Megginson 1.2.4-1
+- the 1.2.4 release - git tag 389-ds-console-1.2.4
+- Bug 450016 - RFE- Console display values in KB/MB/GB
+- Bug 387981 - plain files can be chosen on the Restore Directory dialog
+- Bug 661116 - 389-console Configuration tab admin permissions (nsslapd-referral ?) and folder not expending immediatly
+- Bug 151705 - Need to update Console Cipher Preferences with new ciphers
+- Bug 553066 - Directory Console: do not display "subtree" index type
+- Bug 599732 - Root node in directory browser shows DN syntax error
+
+* Thu May 13 2010 Rich Megginson 1.2.3-1
+- the 1.2.3 release
+
+* Fri Apr 30 2010 Rich Megginson 1.2.2-1
+- the 1.2.2 release
+
+* Thu Apr 15 2010 Rich Megginson 1.2.1-1
+- the 1.2.1 release
+
+* Fri Dec 18 2009 Rich Megginson - 1.2.0-6
+- Excluding PPC for EPEL builds as there is not openjdk there
+
* Wed Aug 12 2009 Rich Megginson 1.2.0-5
- final rebuild for 1.2.0 release
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 86e7a55..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-ds-console
-# $Id$
-NAME := 389-ds-console
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/import.log b/import.log
deleted file mode 100644
index 63fa288..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-89-ds-console-1_2_0-3:HEAD:389-ds-console-1.2.0-3.src.rpm:1247864626
diff --git a/sources b/sources
index fa91f69..9178cfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a856772523e5a331e1c407545ee3cfc 389-ds-console-1.2.0.tar.bz2
+423108a3daf39f33e5de5a424c9212fb 389-ds-console-1.2.12.tar.bz2