rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.41,1.42
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Fri May 30 19:37:32 UTC 2008
Author: fitzsim
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18228
Modified Files:
java-1.6.0-openjdk.spec
Log Message:
* 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.
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- java-1.6.0-openjdk.spec 28 May 2008 15:18:50 -0000 1.41
+++ java-1.6.0-openjdk.spec 30 May 2008 19:35:29 -0000 1.42
@@ -129,20 +129,19 @@
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
-# 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.
+# FIXME: The licenses in the jhat sources need to be fixed with proper
+# GPL headers.
Patch2: java-1.6.0-openjdk-jhat.patch
Patch3: java-1.6.0-openjdk-freetype.patch
Patch4: java-1.6.0-openjdk-java-access-bridge-tck.patch
@@ -153,11 +152,7 @@
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
-%if %{?fedora}0
BuildRequires: lesstif-devel
-%else
-BuildRequires: openmotif-devel
-%endif
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libXp-devel
@@ -181,7 +176,7 @@
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-fonts-Type1
BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel >= 2.2.0
+BuildRequires: freetype-devel >= 2.3.0
BuildRequires: fontconfig
BuildRequires: eclipse-ecj
# Java Access Bridge for GNOME build requirements.
@@ -194,7 +189,7 @@
BuildRequires: gecko-devel
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
-# Zero-assembler build requirement
+# Zero-assembler build requirement.
%ifnarch x86_64 %{ix86}
BuildRequires: libffi-devel
%endif
@@ -202,7 +197,7 @@
Requires: libjpeg = 6b
# Require /etc/pki/java/cacerts.
Requires: ca-certificates
-# Require jpackage-utils for ant
+# Require jpackage-utils for ant.
Requires: jpackage-utils >= 1.7.3-1jpp.3
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
@@ -217,7 +212,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
@@ -255,7 +250,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
@@ -277,7 +272,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
@@ -290,7 +285,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
@@ -306,7 +301,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
@@ -328,7 +323,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
@@ -350,6 +345,7 @@
cp %{SOURCE7} .
%build
+# Build IcedTea and OpenJDK.
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
@@ -362,29 +358,40 @@
patch -l -p0 < %{PATCH2}
patch -l -p1 < %{PATCH3}
make
-echo ====================JTREG TESTING========================
-( make jtregcheck -k | tee jtreg_output ) || :
-echo ====================JTREG TESTING END====================
+
+export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
+
+# Build Java Access Bridge for GNOME.
pushd java-access-bridge-%{accessver}
- patch -l -p1 < %{PATCH4}
- export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
- export PATH=$JAVA_HOME/bin:$PATH
+ patch -l -p1 < %{PATCH3}
+ 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
+
+# Run jtreg test suite.
+echo ====================JTREG TESTING========================
+{
+ make jtregcheck -k | tee jtreg_output
+} || :
+echo ====================JTREG TESTING END====================
+
+# Run Mauve test suite.
pushd mauve-%{mauvedate}
- ./configure
+ ./configure
make
echo ====================MAUVE 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 ) || :
+ {
+ $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
@@ -409,7 +416,6 @@
ln -sf $RELATIVE/cacerts .
popd
-
# Install extension symlinks.
install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
pushd $RPM_BUILD_ROOT%{jvmjardir}
@@ -481,14 +487,14 @@
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
-# Install jconsole, policytool and javaws desktop files.
+# Install javaws, policytool and jconsole desktop files.
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/{applications,pixmaps}
cp javaws.png $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install \
@@ -537,7 +543,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
@@ -789,7 +795,7 @@
%{jvmjardir}
%dir %{_jvmdir}/%{jredir}/lib/security
%{_jvmdir}/%{jredir}/lib/security/cacerts
-#FIXME: These should be replaced by symlinks into /etc.
+# FIXME: These should be replaced by symlinks into /etc.
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
@@ -862,8 +868,10 @@
%defattr(-,root,root,-)
%doc README.src
%{_jvmdir}/%{sdkdir}/src.zip
+# FIXME: put these in a separate testresults subpackage.
%doc mauve_tests
%doc mauve-%{mauvedate}/mauve_output
+%doc jtreg_output
%files javadoc
%defattr(-,root,root,-)
@@ -875,6 +883,10 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* 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.
@@ -884,47 +896,43 @@
- Remove cacerts from files list.
- Resolves: rhbz#444260
-* Mon May 26 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.15.b09
+* 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.15.b09
+* 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.15.b09
+* 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.14.b09
+* 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.13.b09
+* 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.12.b09
+* 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.12.b09
+* 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.
+ java-1.6.0-openjdk-policytool.desktop files.
-* Tue Apr 29 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.12.b09
-- Added archbuild and archinstall definitions for ia64 .
+* 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 Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.12.b09
-- 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
-
-* 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.
@@ -943,7 +951,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.
@@ -961,7 +969,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.
@@ -988,7 +996,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
@@ -997,7 +1005,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
@@ -1014,8 +1022,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.
@@ -1061,8 +1069,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
@@ -1128,9 +1136,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
@@ -1158,7 +1166,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.
More information about the fedora-extras-commits
mailing list