rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec, 1.26, 1.27 sources, 1.14, 1.15 java-1.6.0-openjdk-jconsole.desktop, 1.1, NONE java-1.6.0-openjdk-jhat.patch, 1.1, NONE java-1.6.0-openjdk-policytool.desktop, 1.1, NONE
Lubomir Rintel (lkundrak)
fedora-extras-commits at redhat.com
Wed Jul 23 23:03:27 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29758
Modified Files:
java-1.6.0-openjdk.spec sources
Removed Files:
java-1.6.0-openjdk-jconsole.desktop
java-1.6.0-openjdk-jhat.patch
java-1.6.0-openjdk-policytool.desktop
Log Message:
Attempt to bring devel and EL-5 in sync
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- java-1.6.0-openjdk.spec 23 Jul 2008 08:56:41 -0000 1.26
+++ java-1.6.0-openjdk.spec 23 Jul 2008 23:02:42 -0000 1.27
@@ -3,6 +3,9 @@
# java-1.6.0-openjdk-devel.
%define gcjbootstrap 0
+# If runtests is 0 test suites will not be run.
+%define runtests 1
+
%define icedteaver 1.3
%define icedteasnapshot -30aed052fabd0303b4001763652b94c054fa59e7
%define openjdkver b11
@@ -21,29 +24,27 @@
%define mauvedate 2008-03-11
+%define multilib_arches ppc64 sparc64 x86_64
+
%define jit_arches %{ix86} x86_64
-%ifarch x86_64
-%define archbuild amd64
-%define archinstall amd64
-%else
-%ifarch ppc
-%define archbuild ppc
-%define archinstall ppc
-%else
-%ifarch ppc64
-%define archbuild ppc64
-%define archinstall ppc64
-%else
%ifarch %{ix86}
%define archbuild i586
%define archinstall i386
-%else
-%define archbuild zero
-%define archinstall zero
%endif
+%ifarch x86_64
+%define archbuild amd64
+%define archinstall amd64
%endif
+%ifnarch %{jit_arches}
+%define archbuild %{_arch}
+%define archinstall %{_arch}
%endif
+
+# Reduce build time from 27 hours to 12 hours by only running test
+# suites on JIT architectures.
+%ifnarch %{jit_arches}
+%define runtests 0
%endif
%define buildoutputdir openjdk/control/build/linux-%{archbuild}
@@ -62,7 +63,7 @@
# Hard-code libdir on 64-bit architectures to make the 64-bit JDK
# simply be another alternative.
-%ifarch x86_64 ppc64 sparc64
+%ifarch %{multilib_arches}
%define syslibdir %{_prefix}/lib64
%define _libdir %{_prefix}/lib
%define archname %{name}.%{_arch}
@@ -85,7 +86,7 @@
# Standard JPackage directories and symbolic links.
# Make 64-bit JDKs just another alternative on 64-bit architectures.
-%ifarch x86_64 ppc64 sparc64
+%ifarch %{multilib_arches}
%define sdklnk java-%{javaver}-%{origin}.%{_arch}
%define jrelnk jre-%{javaver}-%{origin}.%{_arch}
%define sdkdir %{name}-%{version}.%{_arch}
@@ -97,7 +98,7 @@
%define jredir %{sdkdir}/jre
%define sdkbindir %{_jvmdir}/%{sdklnk}/bin
%define jrebindir %{_jvmdir}/%{jrelnk}/bin
-%ifarch x86_64 ppc64 sparc64
+%ifarch %{multilib_arches}
%define jvmjardir %{_jvmjardir}/%{name}-%{version}.%{_arch}
%else
%define jvmjardir %{_jvmjardir}/%{name}-%{version}
@@ -108,7 +109,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.14.%{openjdkver}%{?dist}.1
+Release: 0.19.%{openjdkver}%{?dist}.1
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -126,23 +127,18 @@
URL: http://icedtea.classpath.org/
Source0: %{url}download/source/icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz
Source1: %{fedorazip}
-# Save icedtea.classpath.org space and bandwidth.
-# NoSource: 1
Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
Source3: %{genurl}generate-fedora-zip.sh
Source4: README.src
Source5: README.plugin
Source6: mauve-%{mauvedate}.tar.gz
Source7: mauve_tests
-Source8: %{name}-jconsole.desktop
-Source9: %{name}-policytool.desktop
-# FIXME: This patch needs to be fixed. optflags argument -mtune=generic is being ignored
-# because it breaks several graphical applications.
+# FIXME: This patch needs to be fixed. optflags argument
+# -mtune=generic is being ignored because it breaks several graphical
+# applications.
Patch0: java-1.6.0-openjdk-optflags.patch
-Patch1: java-1.6.0-openjdk-makefile.patch
-# FIXME: The licenses in the jhat sources need to be fixed with proper
-# GPL Licenses.
-Patch2: java-1.6.0-openjdk-jhat.patch
+Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch
+Patch2: java-1.6.0-openjdk-makefile.patch
Patch3: java-1.6.0-openjdk-freetype.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -151,7 +147,7 @@
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
-%if %{?fedora}0
+%if 0%{?fedora}
BuildRequires: lesstif-devel
%else
BuildRequires: openmotif-devel
@@ -170,6 +166,7 @@
BuildRequires: mercurial
BuildRequires: ant
BuildRequires: libXinerama-devel
+BuildRequires: rhino
%if %{gcjbootstrap}
BuildRequires: java-1.5.0-gcj-devel
%else
@@ -181,6 +178,7 @@
BuildRequires: xorg-x11-fonts-misc
BuildRequires: freetype-devel >= 2.2.0
BuildRequires: fontconfig
+BuildRequires: eclipse-ecj
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
BuildRequires: gawk
@@ -191,18 +189,22 @@
BuildRequires: gecko-devel
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
-# Zero-assembler build requirement
-%ifnarch x86_64 %{ix86}
+# Zero-assembler build requirement.
+%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
-BuildRequires: rhino
Requires: libjpeg = 6b
+%if 0%{?fedora} > 9
+# Require /etc/pki/java/cacerts.
+Requires: ca-certificates
+%else
# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
# cacerts.
Requires: openssl
-# Require jpackage-utils for ant
-Requires: jpackage-utils >= 1.7.3-1jpp.3
+%endif
+# Require jpackage-utils for ant.
+Requires: jpackage-utils >= 1.7.3-1jpp.2
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
# Post requires alternatives to install tool alternatives.
@@ -216,7 +218,7 @@
# for jnlp files.
Requires(postun): %{_bindir}/update-desktop-database
-# java-1.6.0-openjdk replaces java-1.7.0-icedtea
+# java-1.6.0-openjdk replaces java-1.7.0-icedtea.
Provides: java-1.7.0-icedtea = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea < 0:1.7.0.0-0.999
@@ -254,7 +256,7 @@
# Postun requires alternatives to uninstall tool alternatives.
Requires(postun): %{_sbindir}/alternatives
-# java-1.6.0-openjdk-devel replaces java-1.7.0-icedtea-devel
+# java-1.6.0-openjdk-devel replaces java-1.7.0-icedtea-devel.
Provides: java-1.7.0-icedtea-devel = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea-devel < 0:1.7.0.0-0.999
@@ -276,7 +278,7 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
-# java-1.6.0-openjdk-demo replaces java-1.7.0-icedtea-demo
+# java-1.6.0-openjdk-demo replaces java-1.7.0-icedtea-demo.
Provides: java-1.7.0-icedtea-demo = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea-demo < 0:1.7.0.0-0.999
@@ -289,7 +291,7 @@
Requires: %{name} = %{epoch}:%{version}-%{release}
-# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src
+# java-1.6.0-openjdk-src replaces java-1.7.0-icedtea-src.
Provides: java-1.7.0-icedtea-src = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea-src < 0:1.7.0.0-0.999
@@ -305,7 +307,7 @@
# Postun requires alternatives to uninstall javadoc alternative.
Requires(postun): %{_sbindir}/alternatives
-# java-1.6.0-openjdk-javadoc replaces java-1.7.0-icedtea-javadoc
+# java-1.6.0-openjdk-javadoc replaces java-1.7.0-icedtea-javadoc.
Provides: java-1.7.0-icedtea-javadoc = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea-javadoc < 0:1.7.0.0-0.999
@@ -327,7 +329,7 @@
# Postun requires alternatives to uninstall plugin alternative.
Requires(postun): %{_sbindir}/alternatives
-# java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin
+# java-1.6.0-openjdk-plugin replaces java-1.7.0-icedtea-plugin.
Provides: java-1.7.0-icedtea-plugin = 0:1.7.0.0-0.999
Obsoletes: java-1.7.0-icedtea-plugin < 0:1.7.0.0-0.999
@@ -343,50 +345,74 @@
%setup -q -n icedtea6-%{icedteaver} -T -D -a 6
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
-%patch1
+%patch2
cp %{SOURCE4} .
cp %{SOURCE5} .
cp %{SOURCE7} .
-cp %{SOURCE8} jconsole.desktop
-cp %{SOURCE9} policytool.desktop
%build
+# Build IcedTea and OpenJDK.
+%ifarch sparc64
+export ARCH_DATA_MODEL=64
+%endif
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
pushd openjdk-ecj
- patch -l -p1 < %{PATCH2}
patch -l -p2 < %{PATCH3}
popd
%endif
make stamps/patch.stamp
-patch -l -p0 < %{PATCH2}
patch -l -p1 < %{PATCH3}
+
make
+
+export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
+
+# Build Java Access Bridge for GNOME.
pushd java-access-bridge-%{accessver}
- export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
- export PATH=$JAVA_HOME/bin:$PATH
+ patch -l -p1 < %{PATCH1}
+ OLD_PATH=$PATH
+ export PATH=$JAVA_HOME/bin:$OLD_PATH
./configure
make
+ export PATH=$OLD_PATH
cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
popd
-# Running Mauve to check for regressions
-pushd mauve-%{mauvedate}
- ./configure
- make
- echo ====================MAUVE TESTING========================
+
+%if %{runtests}
+# Run jtreg test suite.
+{
+ echo ====================JTREG TESTING========================
export DISPLAY=:20
- Xvfb :20 -screen 0 1x1x24 -ac&
+ Xvfb :20 -screen 0 1x1x24 -ac&
echo $! > Xvfb.pid
- ( $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
- -file %{SOURCE7} \
- -timeout 30000 2>&1 | tee mauve_output ) || :
+ make jtregcheck -k | tee jtreg_output
kill -9 `cat Xvfb.pid`
unset DISPLAY
rm -f Xvfb.pid
- echo ====================MAUVE TESTING END====================
-popd
+ echo ====================JTREG TESTING END====================
+} || :
+
+# Run Mauve test suite.
+{
+ pushd mauve-%{mauvedate}
+ ./configure
+ make
+ echo ====================MAUVE TESTING========================
+ export DISPLAY=:20
+ Xvfb :20 -screen 0 1x1x24 -ac&
+ echo $! > Xvfb.pid
+ $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java \
+ -file %{SOURCE7} -timeout 30000 2>&1 | tee mauve_output
+ kill -9 `cat Xvfb.pid`
+ unset DISPLAY
+ rm -f Xvfb.pid
+ echo ====================MAUVE TESTING END====================
+ popd
+} || :
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -399,6 +425,16 @@
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
+%if 0%{?fedora} > 9
+ # Install cacerts symlink.
+ rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts
+ pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+ RELATIVE=$(%{abs2rel} %{_sysconfdir}/pki/java \
+ %{_jvmdir}/%{jredir}/lib/security)
+ ln -sf $RELATIVE/cacerts .
+ popd
+%endif
+
# Install extension symlinks.
install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
pushd $RPM_BUILD_ROOT%{jvmjardir}
@@ -470,22 +506,22 @@
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# Install icons and menu entries
+# Install icons and menu entries.
for s in 16 24 32 48 ; do
install -D -p -m 644 \
openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png
done
-for e in jconsole policytool ; do
- desktop-file-install --vendor=fedora --mode=644 \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
-done
-# Install javaws desktop file.
+# Install desktop files.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
-desktop-file-install --vendor='' \
+desktop-file-install --vendor ''\
--dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
+for e in jconsole policytool ; do
+ desktop-file-install --vendor=fedora --mode=644 \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
+done
# Find JRE directories.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
@@ -526,7 +562,7 @@
%clean
rm -rf $RPM_BUILD_ROOT
-# FIXME: identical binaries are copied, not linked. This needs to be
+# FIXME: identical binaries are copied, not linked. This needs to be
# fixed upstream.
%post
ext=.gz
@@ -635,6 +671,7 @@
--slave %{_bindir}/javap javap %{sdkbindir}/javap \
--slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
--slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
+ --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
--slave %{_bindir}/jinfo jinfo %{sdkbindir}/jinfo \
--slave %{_bindir}/jmap jmap %{sdkbindir}/jmap \
--slave %{_bindir}/jps jps %{sdkbindir}/jps \
@@ -672,6 +709,8 @@
%{_mandir}/man1/jconsole-%{name}.1$ext \
--slave %{_mandir}/man1/jdb.1$ext jdb.1$ext \
%{_mandir}/man1/jdb-%{name}.1$ext \
+ --slave %{_mandir}/man1/jhat.1$ext jhat.1$ext \
+ %{_mandir}/man1/jhat-%{name}.1$ext \
--slave %{_mandir}/man1/jinfo.1$ext jinfo.1$ext \
%{_mandir}/man1/jinfo-%{name}.1$ext \
--slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \
@@ -777,8 +816,7 @@
%{_jvmprivdir}/*
%{jvmjardir}
%dir %{_jvmdir}/%{jredir}/lib/security
-#FIXME: These should be replaced by symlinks into /etc.
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
+%{_jvmdir}/%{jredir}/lib/security/cacerts
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
@@ -851,8 +889,12 @@
%defattr(-,root,root,-)
%doc README.src
%{_jvmdir}/%{sdkdir}/src.zip
+%if %{runtests}
+# FIXME: put these in a separate testresults subpackage.
%doc mauve_tests
%doc mauve-%{mauvedate}/mauve_output
+%doc jtreg_output
+%endif
%files javadoc
%defattr(-,root,root,-)
@@ -865,32 +907,123 @@
%changelog
* Wed Jul 23 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0-0.14.b11.1
-- Specify vendor for javaws desktop entry
+- Specify vendor for javaws desktop entry.
+- Merge EPEL-5 and Fedora devel packages.
-* Tue Jul 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.14.b11
-- Added rhino as a build requirement.
+* Mon Jul 21 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.19.b11
+- Updated icedteasnapshot.
-* Mon Jul 21 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.14.b11
-- Updated accessmajorver.
+* Wed Jul 16 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
- Updated icedteasnapshot.
+- Updated openjdkver.
+- Updated openjdkdate.
+- Updated generate-fedora-zip.sh
+
+* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
+- Updated accessver to 1.23.
+
+* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
+- Added rhino as a BuildRequirement.
+
+* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
+- Removed all unneeded patches. Security patches are included in the
+new icedtea source.
+
+* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
+- Fixed fedorazip.
+
+* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
- Updated icedteaver.
+- Updated icedteasnapshot.
- Updated openjdkdate.
-- Removed security patches. Now apart of new sources.
+- Updated openjdkver.
- Updated release.
+- Resolves: rhbz#452525
+- Resolves: rhbz#369861
+
+* Thu Jul 9 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.17.b09
+- Added sparc/64 patches.
-* Wed Jul 8 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.13.b08
-- Only apply hotspot security patch on jit_arches.
+* Wed Jul 8 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.17.b09
+- Only apply hotspot security patch of jitarches.
-* Wed Jul 2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.13.b08
+* Wed Jul 2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.17.b09
- Added OpenJDK security patches.
-* Mon Apr 28 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.12.b08
+* Tue Jun 3 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.16.b09
+- Add runtests define.
+- Provide Xvfb instance to jtreg.
+- Run test suites on JIT architectures only.
+- Clean up arch handling.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Remove jhat patch.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Remove makefile patch.
+- Update generate-fedora-zip.sh.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Formatting cleanups.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Group all Mauve commands.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Formatting cleanups.
+- Add jtreg_output to src subpackage.
+
+* Wed May 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.15.b09
+- Updated icedteasnapshot for new release.
+
+* Tue May 27 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Require ca-certificates.
+- Symlink to ca-certificates cacerts.
+- Remove cacerts from files list.
+- Resolves: rhbz#444260
+
+* Mon May 26 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.14.b09
+- Added eclipse-ecj build requirement for mauve.
+- Updated icedteasnapshot.
+
+* Fri May 23 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.14.b09
+- Fixed jtreg testing.
+
+* Fri May 23 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.14.b09
+- Updated icedteasnapshot.
+- Updated release.
+- Added jtreg testing.
+
+* Thu May 22 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.13.b09
+- Added new patch java-1.6.0-openjdk-java-access-bridge-tck.patch.
+- Updated release.
+
+* Mon May 05 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.12.b09
+- Updated release.
+- Updated icedteasnapshot.
+- Resolves: rhbz#445182
+- Resolves: rhbz#445183
+
+* Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.11.b09
+- Fixed javaws.desktop installation.
+
+* Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.11.b09
+- Updated icedteasnapshot.
+- Removed java-1.6.0-openjdk-jconsole.desktop and
+ java-1.6.0-openjdk-policytool.desktop files.
+
+* Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.11.b09
+- Updated release.
+- Added archbuild and archinstall definitions for ia64.
+- Resolves: rhbz#433843
+
+* Mon Apr 28 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-0.12.b08
- Merge changes made to build on Red Hat Enterprise Linux 5, to include in EPEL:
-- Require Freetype 2.2.0 instead of 2.3.0
-- Build against openmotif instead of lesstif when not on Fedora
+- Require Freetype 2.2.0 instead of 2.3.0.
+- Build against openmotif instead of lesstif when not on Fedora.
-* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.11.b09
-- Fixed javaws.desktop and javaws.png installation.
+* Mon Apr 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.10.b09
+- Fixed installation of javaws.desktop and javaws.png.
* Mon Apr 28 2008 Joshua Sumali <jsumali at redhat.com> - 1:1.6.0.0-0.10.b09
- Added javaws menu entry.
@@ -909,7 +1042,7 @@
* Thu Apr 18 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.9.b09
- Updated icedteaver.
-- Updated icedteasnapshot.
+- Updated icedteasnapshot.
- Updated openjdkver.
- Updated openjdkdate.
- Updated release.
@@ -927,7 +1060,7 @@
- Updated icedteaver.
* Mon Apr 07 2008 Dennis Gilmore <dennis at ausil.us> - 1:1.6.0.0-0.8.b08
-- enable building for all arches using zero where there is not a native port
+- Enable building for all arches using zero where there is not a native port.
* Mon Mar 31 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.7.b08
- Updated icedteasnapshot. Includes sources needed to build xmlgraphics-commons.
@@ -954,7 +1087,7 @@
* Mon Mar 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
- Updated icedteasnapshot.
- Updated Release.
-- Added new patch: java-1.6.0-openjdk-optflags.patch
+- Added new patch: java-1.6.0-openjdk-optflags.patch.
- Resolves: rhbz#437331
* Mon Mar 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
@@ -963,7 +1096,7 @@
* Fri Mar 14 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.4.b06
- Fixed Provides and Obsoletes for all sub-packages. Should have specified
-java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999.
+ java-1.7.0-icedtea < 1.7.0.0-0.999 instead of 1.7.0-0.999.
- Resolves: rhbz#437492
* Wed Mar 12 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.4.b06
@@ -980,8 +1113,8 @@
- Changed icedteaopt to use --with-openjdk instead of --with-icedtea.
* Tue Mar 11 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.2.b06
-- Added Provides and Obsoletes for all subpackages. All sub-packages
-replaces java-1.7.0-icedtea.
+- Added Provides and Obsoletes for all subpackages. All sub-packages
+ replaces java-1.7.0-icedtea.
- Updated Release.
- Changed BuildRequires from java-1.7.0-icedtea to java-1.6.0-openjdk.
- Added TRADEMARK file to docs.
@@ -1027,8 +1160,8 @@
- Fixed archbuild/archinstall if-block.
* Thu Jan 03 2008 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.23.b24.snapshot
-- Removed BuildRequirement firefox-devel
-- Added BuildRequirement gecko-devel
+- Removed BuildRequirement firefox-devel.
+- Added BuildRequirement gecko-devel.
- Resolves rhbz#427350
* Fri Dec 28 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.23.b24.snapshot
@@ -1094,9 +1227,9 @@
- Removed gcjbootstrap.
- Removed icedteaopt.
- Removed all gcj related checks.
-- Resolves: rhbz#317041
-- Resolves: rhbz#314211
-- Resolves: rhbz#314141
+- Resolves: rhbz#317041
+- Resolves: rhbz#314211
+- Resolves: rhbz#314141
- Resolves: rhbz#301691
* Mon Oct 1 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.16.b19.snapshot
@@ -1124,7 +1257,7 @@
is thrown
* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b19.snapshot
-- Added JTreg zip as source
+- Added JTreg zip as source.
- Run JTreg tests after build for smoke testing.
- Added Xvfb as build requirement.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 21 Jul 2008 21:06:56 -0000 1.14
+++ sources 23 Jul 2008 23:02:42 -0000 1.15
@@ -1,5 +1,5 @@
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
7a0c160c03012cd40957a7a112e25038 mauve_tests
-0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz
+0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
adb53a87bc9546c1093b73c9a5035de5 icedtea6-1.3-30aed052fabd0303b4001763652b94c054fa59e7.tar.gz
--- java-1.6.0-openjdk-jconsole.desktop DELETED ---
--- java-1.6.0-openjdk-jhat.patch DELETED ---
--- java-1.6.0-openjdk-policytool.desktop DELETED ---
More information about the fedora-extras-commits
mailing list