Release 1.1.17-1

- Updated the value of PKGGUID and OLDGUID with uuidgen for Windows Console.
- Resolves #1304595 - Console -- Update Java dependency to 1.8
- Add the option "-Djava.net.preferIPv4Stack=true" to template.bat directly.
- Separate PolicyCRT from CRT in WixMerge.
  Note: there is not policy msm in MSVC 11 C:\Program Files (x86)\Common Files\Merge Modules
- change the nspr library name for windows (win/{Console.wxs,Makefile}).
- Removed unused NOMSM from win/build.bat.
- Resolves #1229424 - Windows console can't be updated, only uninstalled/installed from zero
- Bug 1022104 - Remove versioned jar files
- adding el6dsrv dist
- fixed bogus date

.cvsignore

@@ -1 +0,0 @@
-389-console-1.1.3.tar.bz2

.gitignore

@@ -0,0 +1,4 @@
+389-console-1.1.4.tar.bz2
+/389-console-1.1.7.tar.bz2
+/389-console-1.1.16.tar.bz2
+/389-console-1.1.17.tar.bz2

389-console.spec

@@ -1,28 +1,33 @@
 %define major_version 1.1
-%define minor_version 3
+%define minor_version 17
+
+# only have localization for en right now
+%global consolelang en
 
 Name: 389-console
 Version: %{major_version}.%{minor_version}
-Release: 5%{?dist}
+Release: 1%{?dist}
 Summary: 389 Management Console
 
 Group: Applications/System
 License: LGPLv2
-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
-Requires: idm-console-framework
-Requires: java >= 1:1.6.0
-Requires: which
+Source: https://port389.org/binaries/%{name}-%{version}.tar.bz2
+Requires: idm-console-framework >= 1.1
+Requires: java >= 1.8.0
+Requires: jpackage-utils
 BuildRequires: ant
 BuildRequires: ldapjdk
-BuildRequires: jss
-BuildRequires: idm-console-framework
-BuildRequires: java-devel >= 1:1.6.0
-Provides: fedora-idm-console = %{version}-%{release}
-Obsoletes: fedora-idm-console < 1.1.3-2
+BuildRequires: jss >= 4.2
+BuildRequires: idm-console-framework >= 1.1
+BuildRequires: java-devel >= 1.8.0
+BuildRequires: jpackage-utils
+%if 0%{?rhel} < 6
+ExcludeArch: ppc
+%endif
 
 %description
 A Java based remote management console used for managing 389
@@ -33,7 +38,8 @@ Administration Server and 389 Directory Server.
                                                                                 
 %build
 %{ant} \
-    -Dbuilt.dir=`pwd`/built
+    -Dbuilt.dir=`pwd`/built \
+    buildnoscript
 
 # add -Dlib.dir and -Dneed_libdir on those platforms where
 # jss is installed in a non-standard location
@@ -43,14 +49,21 @@ Administration Server and 389 Directory Server.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 install -m644 built/*.jar $RPM_BUILD_ROOT%{_javadir}
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -m755 built/%{name} $RPM_BUILD_ROOT/%{_bindir}
-
-# create symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}_en.jar %{name}-%{major_version}_en.jar
-ln -s %{name}-%{version}_en.jar %{name}_en.jar
-popd
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/java
+cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf <<EOF
+for file in %{_sysconfdir}/java/*-%{name}.conf ; do
+    if [ -f "\$file" ] ; then
+       . "\$file"
+    fi
+done
+mylang=\${mylang:-%{consolelang}}
+ADDITIONAL_JARS=\${ADDITIONAL_JARS:-%{name}_\$mylang.jar}
+ADDITIONAL_OPTIONS=\${ADDITIONAL_OPTIONS:-"-Djava.util.prefs.systemRoot=\$HOME/.%{name} -Djava.util.prefs.userRoot=\$HOME/.%{name}"}
+EOF
+chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf
+%jpackage_script com.netscape.management.client.console.Console "" "" jss4.jar:ldapjdk.jar:idm-console-base.jar:idm-console-mcc.jar:idm-console-mcc_%{consolelang}.jar:idm-console-nmclf.jar:idm-console-nmclf_%{consolelang}.jar %{name} true
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+install -m644 built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,12 +71,36 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc LICENSE
-%{_javadir}/%{name}-%{version}_en.jar
-%{_javadir}/%{name}-%{major_version}_en.jar
-%{_javadir}/%{name}_en.jar
+%{_javadir}/%{name}_%{consolelang}.jar
 %{_bindir}/%{name}
+%{_sysconfdir}/java/%{name}.conf
+%{_mandir}/man8/*
 
 %changelog
+* Wed May 11 2016 Noriko Hosoi <nhosoi@redhat.com> - 1.1.17-1
+- Release 1.1.17-1
+- Updated the value of PKGGUID and OLDGUID with uuidgen for Windows Console.
+- Resolves #1304595 - Console -- Update Java dependency to 1.8 
+- Add the option "-Djava.net.preferIPv4Stack=true" to template.bat directly.
+- Separate PolicyCRT from CRT in WixMerge.
+  Note: there is not policy msm in MSVC 11 C:\Program Files (x86)\Common Files\Merge Modules
+- change the nspr library name for windows (win/{Console.wxs,Makefile}).
+- Removed unused NOMSM from win/build.bat.
+- Resolves #1229424 - Windows console can't be updated, only uninstalled/installed from zero
+- Bug 1022104 - Remove versioned jar files
+- adding el6dsrv dist
+- fixed bogus date
+
+* Tue Jun 14 2011 Rich Megginson <rmeggins@redhat.com> - 1.1.7-1
+- use jpackage_script instead of packaging our own shell script
+- support "skins" package for other brands/versions
+
+* Thu Apr 15 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.4-1
+- 1.1.4 release
+
+* Fri Dec 18 2009 Rich Megginson <rmeggins@redhat.com> - 1.1.3-6
+- Excluding PPC for EPEL builds as there is not openjdk there
+
 * Wed Sep 30 2009 Rich Megginson <rmeggins@redhat.com> 1.1.3-5
 - bug 521523 - add the "which" package to the Requires
 

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: 389-console
-# $Id$
-NAME := 389-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)

import.log

@@ -1 +0,0 @@
-89-console-1_1_3-2:HEAD:389-console-1.1.3-2.src.rpm:1245357596

sources

@@ -1 +1 @@
-65cc927851ae61d0763ea61fd92f18f9  389-console-1.1.3.tar.bz2
+79e9d094f51ab3b6dbb8e5a955ebe602  389-console-1.1.17.tar.bz2