From 4eeb37c2354b1bc80b7a80248e946acb6dade294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toshio=20=E3=81=8F=E3=82=89=E3=81=A8=E3=81=BF?= Date: Tue, 29 Sep 2009 16:10:09 +0000 Subject: [PATCH 1/5] Initialize branch F-12 for 389-admin-console --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From a634c8bf902d77f0099f09455f883fabbfd88a82 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:51 +0000 Subject: [PATCH 2/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3a6f205..d17111f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := 389-admin-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 72ce8f5ec9c3f475c41fe27beb013cc2e2289f3c Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 18 Dec 2009 16:47:50 +0000 Subject: [PATCH 3/5] exclude platforms that do not support openjdk --- 389-admin-console.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/389-admin-console.spec b/389-admin-console.spec index 9062537..3898035 100644 --- a/389-admin-console.spec +++ b/389-admin-console.spec @@ -6,7 +6,7 @@ Name: 389-admin-console Version: %{major_version}.%{minor_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: 389 Admin Server Management Console Group: Applications/System @@ -23,6 +23,10 @@ BuildRequires: idm-console-framework BuildRequires: java-devel >= 1:1.6.0 Provides: fedora-ds-admin-console = %{version}-%{release} Obsoletes: fedora-ds-admin-console < 1.1.4-1 +%if 0%{?rhel} < 6 +ExcludeArch: ppc +%endif + %description A Java based remote management console used for Managing 389 @@ -83,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html %changelog +* Fri Dec 18 2009 Rich Megginson - 1.1.4-3 +- Excluding PPC for EPEL builds as there is not openjdk there + * Fri Jul 24 2009 Fedora Release Engineering - 1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 76bc180ac41a5fe72f3099a509e6aff0f355d06d Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 2 Jun 2010 15:11:52 +0000 Subject: [PATCH 4/5] the 1.1.5 release --- .cvsignore | 2 +- 389-admin-console.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8805f0c..02726e2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -389-admin-console-1.1.4.tar.bz2 +389-admin-console-1.1.5.tar.bz2 diff --git a/389-admin-console.spec b/389-admin-console.spec index 3898035..84843f8 100644 --- a/389-admin-console.spec +++ b/389-admin-console.spec @@ -1,12 +1,12 @@ %define major_version 1.1 -%define minor_version 4 +%define minor_version 5 %define shortname 389-admin %define pkgname dirsrv Name: 389-admin-console Version: %{major_version}.%{minor_version} -Release: 3%{?dist} +Release: 1%{?dist} Summary: 389 Admin Server Management Console Group: Applications/System @@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html %changelog +* Wed Jun 2 2010 Rich Megginson - 1.1.5-1 +- the 1.1.5 release + * Fri Dec 18 2009 Rich Megginson - 1.1.4-3 - Excluding PPC for EPEL builds as there is not openjdk there diff --git a/sources b/sources index 7423bfb..66b3eb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55c661be949c27b9ff2f754abbc2607f 389-admin-console-1.1.4.tar.bz2 +14bc2716b57bc4e79128548234850179 389-admin-console-1.1.5.tar.bz2 From 5e1d9e38554d72488781c78148c7bc6e961d4b97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:44 +0000 Subject: [PATCH 5/5] 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 d17111f..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: 389-admin-console -# $Id$ -NAME := 389-admin-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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 diff --git a/import.log b/import.log deleted file mode 100644 index 09c8bf4..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -89-admin-console-1_1_4-1:HEAD:389-admin-console-1.1.4-1.src.rpm:1247850936