commit java-1_6_0-openjdk for openSUSE:Factory
Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at Fri May 15 22:34:33 CEST 2009. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-04-21 14:10:32.000000000 +0200 +++ java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2009-05-15 14:37:31.000000000 +0200 @@ -1,0 +2,33 @@ +Fri May 15 14:37:13 CEST 2009 - mvyskocil@suse.cz + +- 'used systemtap-sdt-devel (see bnc#503088)' + +------------------------------------------------------------------- +Thu May 14 09:21:59 CEST 2009 - mvyskocil@suse.cz + +- Change version system for openjdk, now it uses a + %%{javaver}.%%{buildver}_%{{openjdkver} +- Enabled systemtap support +- Moved jpackage macro definitions upper in spec + +------------------------------------------------------------------- +Wed May 13 14:23:59 CEST 2009 - mvyskocil@suse.cz + +- updates: + * openjdk b16 + * icedtea snapshot cc658d9f4a64 + * hotspot snapshot fc6a5ae3fef5 +- new features: + * systemtap support (not yet enabled in SUSE) + * removed gcjwebplugin + * fixed lcms breakage + https://bugs.openjdk.java.net/show_bug.cgi?id=100050 + * fixes in JNLP runtime + * various improvements in support of third party VMs (shark, cacao, zero) +- patches changes: + * removed obsoleted pulseaudio patch + * added openjdk-6-src-b16-no-return-in-nonvoid-function.patch +- enabled tests +- build using xulrunner 1.9.1 on 11.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- java-1.6.0-openjdk-pulsejava.patch New: ---- icedtea6-cc658d9f4a64.tar.bz2 openjdk-6-src-b16-24_apr_2009-fedora.tar.bz2 openjdk-6-src-b16-no-return-in-nonvoid-function.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.fx9009/_old 2009-05-15 22:32:45.000000000 +0200 +++ /var/tmp/diff_new_pack.fx9009/_new 2009-05-15 22:32:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package java-1_6_0-openjdk (Version MACRO) +# spec file for package java-1_6_0-openjdk (Version 1.6.0.0_MACRO) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,11 +17,11 @@ %define gcjbootstrap 0 -%define runtest 0 -%define icedteaver 1.4.1 -%define icedteasnapshot %{nil} -%define openjdkver b14 -%define openjdkdate 25_nov_2008 +%define runtests 0 +%define icedteaver %{nil} +%define icedteasnapshot cc658d9f4a64 +%define openjdkver b16 +%define openjdkdate 24_apr_2009 %define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ %define accessmajorver 1.23 %define accessminorver 0 @@ -54,7 +54,7 @@ %ifnarch %{jit_arches} %define runtests 0 %endif -%define buildoutputdir openjdk/control/build/linux-%{archbuild} +%define buildoutputdir openjdk/build/linux-%{archbuild} %if %{gcjbootstrap} %define icedteaopt --with-libgcj-jar=%_javadir/libgcj-4.3.jar --with-gcj-home=%_jvmdir/java-1.5.0-gcj %else @@ -73,17 +73,17 @@ %define archsuffix %{nil} %define syslibdir %{_libdir} %endif +# Standard JPackage naming and versioning defines. +%define origin openjdk +%define priority 17102 +%define javaver 1.6.0 +%define buildver 0 # Hard-code libdir on 64-bit architectures to make the 64-bit JDK # simply be another alternative. %define sdkname java-%{javaver}-%{origin} %define archname %{sdkname}%{archsuffix} # use a same name of alternatives as Sun/IBM Java %define javaplugin javaplugin -# Standard JPackage naming and versioning defines. -%define origin openjdk -%define priority 17102 -%define javaver 1.6.0 -%define buildver 0 # Standard JPackage directories and symbolic links. # Make 64-bit JDKs just another alternative on 64-bit architectures. # FIXME: add a archsuffix, or use of an baseline.conf @@ -106,8 +106,8 @@ %if 0%suse_version <= 1100 Obsoletes: %obsoletes %endif -Version: %{icedteaver}_%{openjdkver} -Release: 27 +Version: 1.6.0.0_%{openjdkver} +Release: 1 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Languages/Java License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -164,7 +164,8 @@ Patch2: java-1.6.0-openjdk-makefile.patch Patch3: java-1.6.0-openjdk-java-access-bridge-idlj.patch Patch4: java-1.6.0-openjdk-java-access-bridge-security.patch -Patch5: java-1.6.0-openjdk-pulsejava.patch +# deprecated by openjdk b16 +#Patch5: java-1.6.0-openjdk-pulsejava.patch # Obsolete! #Patch103: openjdk-6-src-b09-execstack.patch Patch104: openjdk-6-src-b09-gcc4-warningfixes.patch @@ -180,6 +181,7 @@ # confluence wiki crashes under tomcat6 and openjdk # http://hg.openjdk.java.net/jdk7/hotspot-comp/hotspot/rev/039a914095f4 Patch111: openjdk-6-src-b14-confluence-crash.patch +Patch112: openjdk-6-src-b16-no-return-in-nonvoid-function.patch Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-lib-devel @@ -205,27 +207,33 @@ BuildRequires: java-1_6_0-openjdk java-1_6_0-openjdk-devel %endif # Mauve build requirements. -#BuildRequires: x11-server-xvfb -#BuildRequires: x11-font-type1 -#BuildRequires: x11-font-misc -#BuildRequires: freetype2-devel >= 2.3.0 -#BuildRequires: fontconfig -#BuildRequires: eclipse-ecj +%if %{runtests} +BuildRequires: xorg-x11-server-extra +BuildRequires: xorg-x11-fonts +BuildRequires: freetype2-devel >= 2.3.0 +BuildRequires: fontconfig +BuildRequires: ecj +%endif # Java Access Bridge for GNOME build requirements. BuildRequires: at-spi-devel BuildRequires: gawk BuildRequires: libbonobo-devel BuildRequires: pkgconfig >= 0.9.0 BuildRequires: xorg-x11-util-devel -# gcjwebplugin build requirements. +# IcedTeaPlugin build requirements. BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: mozilla-nspr-devel +%if 0%suse_version >= 1120 +BuildRequires: mozilla-xulrunner191-devel +%else BuildRequires: mozilla-xulrunner190-devel -#!BuildIgnore: mozilla-xulrunner181-devel mozilla-xulrunner181 +%endif # pulse audio requirements BuildRequires: libpulse-devel >= 0.9.11 BuildRequires: pulseaudio >= 0.9.11 +#system tap +BuildRequires: systemtap-sdt-devel # Zero-assembler build requirement. %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -262,6 +270,7 @@ %else PreReq: update-alternatives %endif +Recommends: systemtap # Standard JPackage base provides. Provides: %(echo %name|sed s/_/./g) Provides: jre-%{javaver}-%{origin} = %{version}-%{release} @@ -421,11 +430,12 @@ %prep -%setup -q -n icedtea6-%{icedteaver} -%setup -q -n icedtea6-%{icedteaver} -T -D -a 6 -%setup -q -n icedtea6-%{icedteaver} -T -D -a 2 +%setup -q -n icedtea6-%{icedteasnapshot} +%setup -q -n icedtea6-%{icedteasnapshot} -T -D -a 6 +%setup -q -n icedtea6-%{icedteasnapshot} -T -D -a 2 %patch0 -b .optflags -%patch5 -b .pulseaudio +# deprecated by openjdk b16 +#%patch5 -b .pulseaudio # Obsoleted by 1.4.1 # % patch2 -b .makefile %patch1000 -p1 @@ -442,7 +452,8 @@ --with-openjdk-src-zip=%{SOURCE1} \ --with-pkgversion=suse-%{release}-%{_arch} \ --enable-pulse-java \ - --with-hotspot-src-zip=hotspot.tar.gz + --with-hotspot-src-zip=hotspot.tar.gz \ + --enable-systemtap --with-abs-install-dir=%{_jvmdir}/%{sdkdir} patch_openjdk() { patch -l $* --input=%{PATCH104} %ifarch s390 s390x # contains a special makefile test which is only for s390(x) for now: @@ -462,6 +473,7 @@ patch -l $* --input=%PATCH110 %endif patch -l $* --input=%PATCH111 + patch -l $* --input=%PATCH112 } %if %{gcjbootstrap} make stamps/patch-ecj.stamp @@ -494,6 +506,37 @@ cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext popd +%if %{runtests} +# Run jtreg test suite. +{ + echo ====================JTREG TESTING======================== + export DISPLAY=:20 + Xvfb :20 -screen 0 1x1x24 -ac& + echo $! > Xvfb.pid + make jtregcheck -k + kill -9 `cat Xvfb.pid` + unset DISPLAY + rm -f Xvfb.pid + 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 %{SOURCE6} -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 # skip /usr/lib/rpm/brp-check-bytecode-version: @@ -558,6 +601,9 @@ mkdir sample/rmi mv bin/java-rmi.cgi sample/rmi cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} + # systemtap support + install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ + install -m 0644 tapset/hotspot.stp $RPM_BUILD_ROOT/%{_datadir}/systemtap/tapset/ popd # Install Javadoc documentation. install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} @@ -617,14 +663,11 @@ | sed 's|'$RPM_BUILD_ROOT'||' \ | sed 's|^|%doc |' \
%{name}-demo.files -#symlink dupes -%if 0%suse_version > 1020 # fdupes links the files from JDK to JRE, so it breaks a JRE # use it carefully :)) %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/ %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo %fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname} -%endif # bnc496378 - check the size of installed cacerts # 32 bytes means a default empty one if [[ $(stat -c "%s" $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/lib/security/cacerts) == "32" ]]; then @@ -854,6 +897,8 @@ %{_datadir}/icons/hicolor/48x48 %{_datadir}/pixmaps/javaws.png %{_datadir}/applications/*.desktop +# systemtap support +%{_datadir}/systemtap
%files devel %defattr(-,root,root,-) @@ -909,9 +954,33 @@ %files plugin %defattr(-,root,root,-) -%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so +%{_jvmdir}/%{sdkdir}/jre/lib/*/IcedTeaPlugin.so %changelog +* Fri May 15 2009 mvyskocil@suse.cz +- 'used systemtap-sdt-devel (see bnc#503088)' +* Thu May 14 2009 mvyskocil@suse.cz +- Change version system for openjdk, now it uses a + %%{javaver}.%%{buildver}_%%{{openjdkver} +- Enabled systemtap support +- Moved jpackage macro definitions upper in spec +* Wed May 13 2009 mvyskocil@suse.cz +- updates: + * openjdk b16 + * icedtea snapshot cc658d9f4a64 + * hotspot snapshot fc6a5ae3fef5 +- new features: + * systemtap support (not yet enabled in SUSE) + * removed gcjwebplugin + * fixed lcms breakage + https://bugs.openjdk.java.net/show_bug.cgi?id=100050 + * fixes in JNLP runtime + * various improvements in support of third party VMs (shark, cacao, zero) +- patches changes: + * removed obsoleted pulseaudio patch + * added openjdk-6-src-b16-no-return-in-nonvoid-function.patch +- enabled tests +- build using xulrunner 1.9.1 on 11.2 * Tue Apr 21 2009 mvyskocil@suse.cz - fixed bnc#496378: openjdk has an empty keystore * Tue Apr 14 2009 mvyskocil@suse.cz ++++++ hotspot.tar.gz ++++++ java-1_6_0-openjdk/hotspot.tar.gz java-1_6_0-openjdk/hotspot.tar.gz differ: byte 5, line 1 ++++++ openjdk-6-src-b16-no-return-in-nonvoid-function.patch ++++++ --- ./openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c 2009-05-12 08:51:56.403254452 +0000 +++ ./openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c.new 2009-05-12 09:44:17.303012772 +0000 @@ -300,6 +300,7 @@ free((void *) buf); return tz; } + return tz; } #else #ifdef __solaris__ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de