From 38a66492bfb34fe128748a7f6122aace6148a3ef Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:51 +0000 Subject: [PATCH 1/8] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed03d47..8f7f0dd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: 389-console -# $Id$ +# $Id: Makefile,v 1.1 2009/06/18 20:28:34 tibbs Exp $ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4db747c8cf3707b5516df88099aa07bd0d75e2f8 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 18 Dec 2009 16:48:26 +0000 Subject: [PATCH 2/8] exclude platforms that do not support openjdk --- 389-console.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/389-console.spec b/389-console.spec index 0ead59e..6dc05a1 100644 --- a/389-console.spec +++ b/389-console.spec @@ -3,7 +3,7 @@ Name: 389-console Version: %{major_version}.%{minor_version} -Release: 5%{?dist} +Release: 6%{?dist} Summary: 389 Management Console Group: Applications/System @@ -23,6 +23,9 @@ 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 +%if 0%{?rhel} < 6 +ExcludeArch: ppc +%endif %description A Java based remote management console used for managing 389 @@ -64,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %changelog +* Fri Dec 18 2009 Rich Megginson - 1.1.3-6 +- Excluding PPC for EPEL builds as there is not openjdk there + * Wed Sep 30 2009 Rich Megginson 1.1.3-5 - bug 521523 - add the "which" package to the Requires From 452ef6a5c41aa53f9164bd731103114d5f665bd9 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 17:03:12 +0000 Subject: [PATCH 3/8] this is the 1.1.4 release --- .cvsignore | 2 +- 389-console.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 6b9dab1..1c35865 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-console-1.1.3.tar.bz2 +389-console-1.1.4.tar.bz2 diff --git a/389-console.spec b/389-console.spec index 6dc05a1..503377c 100644 --- a/389-console.spec +++ b/389-console.spec @@ -1,9 +1,9 @@ %define major_version 1.1 -%define minor_version 3 +%define minor_version 4 Name: 389-console Version: %{major_version}.%{minor_version} -Release: 6%{?dist} +Release: 1%{?dist} Summary: 389 Management Console Group: Applications/System @@ -67,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %changelog +* Thu Apr 15 2010 Rich Megginson - 1.1.4-1 +- 1.1.4 release + * Fri Dec 18 2009 Rich Megginson - 1.1.3-6 - Excluding PPC for EPEL builds as there is not openjdk there diff --git a/sources b/sources index 7d12a79..807cb3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -65cc927851ae61d0763ea61fd92f18f9 389-console-1.1.3.tar.bz2 +eaa1b54b2fcc527c37a25e3b5d194fb4 389-console-1.1.4.tar.bz2 From 2b192e01d1c8c21e5da876369e28b159554418fe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 01:41:00 +0000 Subject: [PATCH 4/8] Initialize branch EL-6 for 389-console --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 347ea34384ea07dd7c4df128dc5c2e6b133f43c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:44:02 +0000 Subject: [PATCH 5/8] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - import.log | 1 - 4 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8f7f0dd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-console -# $Id: Makefile,v 1.1 2009/06/18 20:28:34 tibbs Exp $ -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 $$d/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/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 diff --git a/import.log b/import.log deleted file mode 100644 index ecefa78..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -89-console-1_1_3-2:HEAD:389-console-1.1.3-2.src.rpm:1245357596 From 435ddcf2a790fdeeb3b9091c98158882533b657b Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 15 Jun 2011 14:49:25 -0600 Subject: [PATCH 6/8] use jpackage_script instead of packaging our own shell script use jpackage_script instead of packaging our own shell script support "skins" package for other brands/versions --- .gitignore | 1 + 389-console.spec | 49 +++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 36 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 1c35865..757c625 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ 389-console-1.1.4.tar.bz2 +/389-console-1.1.7.tar.bz2 diff --git a/389-console.spec b/389-console.spec index 503377c..42e9790 100644 --- a/389-console.spec +++ b/389-console.spec @@ -1,5 +1,8 @@ %define major_version 1.1 -%define minor_version 4 +%define minor_version 7 + +# only have localization for en right now +%global consolelang en Name: 389-console Version: %{major_version}.%{minor_version} @@ -15,17 +18,16 @@ BuildArch: noarch Source: http://port389.org/sources/%{name}-%{version}.tar.bz2 Requires: idm-console-framework Requires: java >= 1:1.6.0 -Requires: which +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 -%if 0%{?rhel} < 6 -ExcludeArch: ppc -%endif +BuildRequires: jpackage-utils +%if 0%{?rhel} < 6 +ExcludeArch: ppc +%endif %description A Java based remote management console used for managing 389 @@ -36,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 @@ -46,13 +49,24 @@ 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} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/java +cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/%{name}.conf < - 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 - 1.1.4-1 - 1.1.4 release diff --git a/sources b/sources index 807cb3b..49c37fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eaa1b54b2fcc527c37a25e3b5d194fb4 389-console-1.1.4.tar.bz2 +e2c92a908c633fffe79de8add27906c6 389-console-1.1.7.tar.bz2 From 74598770e81ed18b7e6b16fbb4b966469fc334b6 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Fri, 3 Oct 2014 11:50:57 -0400 Subject: [PATCH 7/8] Ticket 47917 - Fix Source location to use new wiki url --- 389-console.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/389-console.spec b/389-console.spec index 42e9790..af50ad1 100644 --- a/389-console.spec +++ b/389-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: idm-console-framework Requires: java >= 1:1.6.0 Requires: jpackage-utils From d9a62023e997577ef30999fa61cc2335987d4bd6 Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Fri, 15 Jul 2016 21:08:06 -0700 Subject: [PATCH 8/8] 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 --- .gitignore | 2 ++ 389-console.spec | 41 +++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 757c625..579cae0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +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 diff --git a/389-console.spec b/389-console.spec index af50ad1..c3833df 100644 --- a/389-console.spec +++ b/389-console.spec @@ -1,5 +1,5 @@ %define major_version 1.1 -%define minor_version 7 +%define minor_version 17 # only have localization for en right now %global consolelang en @@ -11,19 +11,19 @@ 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/binaries/%{name}-%{version}.tar.bz2 -Requires: idm-console-framework -Requires: java >= 1:1.6.0 +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 +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 @@ -62,12 +62,8 @@ ADDITIONAL_OPTIONS=\${ADDITIONAL_OPTIONS:-"-Djava.util.prefs.systemRoot=\$HOME/. 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 - -# create symlinks -pushd $RPM_BUILD_ROOT%{_javadir} -ln -s %{name}-%{version}_%{consolelang}.jar %{name}-%{major_version}_%{consolelang}.jar -ln -s %{name}-%{version}_%{consolelang}.jar %{name}_%{consolelang}.jar -popd +install -d $RPM_BUILD_ROOT%{_mandir}/man8 +install -m644 built%{_mandir}/man8/* $RPM_BUILD_ROOT%{_mandir}/man8 %clean rm -rf $RPM_BUILD_ROOT @@ -75,13 +71,26 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE -%{_javadir}/%{name}-%{version}_%{consolelang}.jar -%{_javadir}/%{name}-%{major_version}_%{consolelang}.jar %{_javadir}/%{name}_%{consolelang}.jar %{_bindir}/%{name} %{_sysconfdir}/java/%{name}.conf +%{_mandir}/man8/* %changelog +* Wed May 11 2016 Noriko Hosoi - 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 - 1.1.7-1 - use jpackage_script instead of packaging our own shell script - support "skins" package for other brands/versions diff --git a/sources b/sources index 49c37fc..7f34bcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2c92a908c633fffe79de8add27906c6 389-console-1.1.7.tar.bz2 +79e9d094f51ab3b6dbb8e5a955ebe602 389-console-1.1.17.tar.bz2