From f6f03908d3c11f4c47871cdf76ac65a93e8f140f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:45:28 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From 2130836cd46f3d4c16d1060de38b6cde65bea073 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Thu, 15 Apr 2010 17:03:12 +0000 Subject: [PATCH 2/4] 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 9a17d8376a638fc791bb28da9203b38ac28db15f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:57 +0000 Subject: [PATCH 3/4] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 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 c4d5656f39bcdafd7821a83063b3283f26f51c32 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 15 Jun 2011 14:49:25 -0600 Subject: [PATCH 4/4] 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 | 52 ++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 39 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..402dc0e 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 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * 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