From 6005330f46f512c5a18b441fd39586e465a26d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?= Date: Fri, 17 Jul 2009 15:37:22 +0000 Subject: [PATCH 1/6] Initialize branch F-11 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..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From b0f46bfdb48e05da47f2ef3d456480a1733b1539 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 17 Jul 2009 17:23:50 +0000 Subject: [PATCH 2/6] initial commit for all branches --- .cvsignore | 1 + 389-admin-console.spec | 117 +++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 119 insertions(+) create mode 100644 389-admin-console.spec diff --git a/.cvsignore b/.cvsignore index e69de29..8805f0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +389-admin-console-1.1.4.tar.bz2 diff --git a/389-admin-console.spec b/389-admin-console.spec new file mode 100644 index 0000000..6d39525 --- /dev/null +++ b/389-admin-console.spec @@ -0,0 +1,117 @@ +%define major_version 1.1 +%define minor_version 4 + +%define shortname 389-admin +%define pkgname dirsrv + +Name: 389-admin-console +Version: %{major_version}.%{minor_version} +Release: 1%{?dist} +Summary: 389 Admin Server Management Console + +Group: Applications/System +License: GPLv2 +URL: http://port389.org + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Source: http://port389.org/sources/%{name}-%{version}.tar.bz2 +Requires: 389-admin +BuildRequires: ant >= 1.6.2 +BuildRequires: ldapjdk +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 + +%description +A Java based remote management console used for Managing 389 +Admin Server. Requires the 389 Console to load and run the +jar files. + +%package doc +Summary: Web docs for 389 Admin Server Management Console +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +Web docs for 389 Admin Server Management Console + +%prep +%setup -q + +%build +%{ant} \ + -Dconsole.location=%{_javadir} \ + -Dbuilt.dir=`pwd`/built + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java +install -m644 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java +install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help +install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin +install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin +install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help + +# create symlinks +pushd $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java +ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar +ln -s %{shortname}-%{version}.jar %{shortname}.jar +ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar +ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar +popd + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc LICENSE +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar +%{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar + +%files doc +%defattr(-,root,root,-) +%dir %{_datadir}/%{pkgname}/manual/en/admin +%doc %{_datadir}/%{pkgname}/manual/en/admin/tokens.map +%doc %{_datadir}/%{pkgname}/manual/en/admin/*.html +%doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html + +%changelog +* Tue Jul 14 2009 Rich Megginson 1.1.4-1 +- relicense source files under GPLv2 +- create doc sub package + +* Fri May 15 2009 Rich Megginson 1.1.3-2 +- rename to 389 + +* Tue Mar 31 2009 Rich Megginson 1.1.3-1 +- this is the 1.1.3 release + +* Thu Jul 3 2008 Rich Megginson 1.1.2-1 +- disable SSLv2 settings + +* Wed Jan 16 2008 Rich Megginson 1.1.1-2 +- rename package to fedora-ds-admin-console + +* Thu Jan 10 2008 Rich Megginson 1.1.1-1 +- changes for fedora package review +- added requires for icedtea java +- added LICENSE + +* Wed Dec 19 2007 Rich Megginson - 1.1.0-4 +- This is for the Fedora DS 1.1 release + +* Thu Oct 25 2007 Rich Megginson - 1.1.0-3 +- updated sources - use dirsrv as package name + +* Wed Aug 8 2007 Nathan Kinder 1.1.0-2 +- Added online help files into package. + +* Thu Aug 2 2007 Nathan Kinder 1.1.0-1 +- Initial creation diff --git a/sources b/sources index e69de29..7423bfb 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +55c661be949c27b9ff2f754abbc2607f 389-admin-console-1.1.4.tar.bz2 From ce0c9b9ec95bd931aebe0cca45c4fecf4168bb1f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:49:51 +0000 Subject: [PATCH 3/6] 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 c7068061c2c9dab93c6f833be10e5521f1128b1b Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Fri, 18 Dec 2009 16:47:50 +0000 Subject: [PATCH 4/6] 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 6d39525..2c0328c 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: 1%{?dist} +Release: 2%{?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-2 +- Excluding PPC for EPEL builds as there is not openjdk there + * Tue Jul 14 2009 Rich Megginson 1.1.4-1 - relicense source files under GPLv2 - create doc sub package From b08714b3061969cbe60a667d305694809c6e48cf Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Wed, 2 Jun 2010 15:11:52 +0000 Subject: [PATCH 5/6] 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 2c0328c..3df6a76 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: 2%{?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-2 - 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 1a8db82f9408208debe430fa1206001e28326657 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 08:43:48 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11