|
@@ -6,14 +6,14 @@
|
|
|
# If runtests is 0 test suites will not be run.
|
|
|
%define runtests 0
|
|
|
|
|
|
-%define icedteaver 1.8.1
|
|
|
+%define icedteaver 1.10.1
|
|
|
%define icedteasnapshot %{nil}
|
|
|
-%define openjdkver b18
|
|
|
-%define openjdkdate 16_feb_2010
|
|
|
+%define openjdkver b22
|
|
|
+%define openjdkdate 28_feb_2011
|
|
|
|
|
|
-%define jaxpdate 2009_10_13
|
|
|
-%define jafdate 2009_10_27
|
|
|
-%define jaxwsdate 2009_10_27
|
|
|
+%define jaxpver 144_01
|
|
|
+%define jafver b20
|
|
|
+%define jaxwsver b20
|
|
|
|
|
|
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
|
|
|
|
|
@@ -22,12 +22,9 @@
|
|
|
%define accessver %{accessmajorver}.%{accessminorver}
|
|
|
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
|
|
|
|
|
|
-%define jafurl http://kenai.com/projects/jdk6-drops/downloads/download/
|
|
|
+%define jafurl http://icedtea.classpath.org/download/drops/
|
|
|
%define jaxpurl https://jaxp.dev.java.net/files/documents/913/147329/
|
|
|
-%define jaxwsurl http://kenai.com/projects/jdk6-drops/downloads/download/
|
|
|
-
|
|
|
-%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/146746/
|
|
|
-%define netbeansurl https://visualvm.dev.java.net/files/documents/7163/150173/
|
|
|
+%define jaxwsurl http://icedtea.classpath.org/download/drops/
|
|
|
|
|
|
%define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
|
|
|
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
|
|
@@ -73,7 +70,7 @@
|
|
|
%define runtests 0
|
|
|
%endif
|
|
|
|
|
|
-%define buildoutputdir openjdk/build/linux-%{archbuild}
|
|
|
+%define buildoutputdir openjdk.build
|
|
|
|
|
|
%if %{gcjbootstrap}
|
|
|
%define icedteaopt %{nil}
|
|
@@ -148,7 +145,7 @@
|
|
|
|
|
|
Name: java-%{javaver}-%{origin}
|
|
|
Version: %{javaver}.%{buildver}
|
|
|
-Release: 3.%{openjdkver}%{?_dist_release}
|
|
|
+Release: 4.%{openjdkver}%{?_dist_release}
|
|
|
|
|
|
Summary: OpenJDK Runtime Environment
|
|
|
Summary(ja): OpenJDK ランタイム環境
|
|
@@ -166,11 +163,9 @@ Source1: http://download.java.net/openjdk/jdk6/promoted/b20/openjdk-6-src-%{ope
|
|
|
#Source5: mauve-%{mauvedate}.tar.gz
|
|
|
#Source6: mauve_tests
|
|
|
|
|
|
-#Source7: %{netbeansurl}/netbeans-profiler-visualvm_release68_1.tar.gz
|
|
|
-#Source8: %{visualvmurl}/visualvm_122-src.tar.gz
|
|
|
-Source9: %{jafurl}jdk6-jaf-%{jafdate}.zip
|
|
|
-Source10: %{jaxpurl}jdk6-jaxp-%{jaxpdate}.zip
|
|
|
-Source11: %{jaxwsurl}jdk6-jaxws-%{jaxwsdate}.zip
|
|
|
+Source9: %{jafurl}jdk6-jaf-%{jafver}.zip
|
|
|
+Source10: %{jaxpurl}jaxp%{jaxpver}.zip
|
|
|
+Source11: %{jaxwsurl}jdk6-jaxws-%{jaxwsver}.zip
|
|
|
|
|
|
# FIXME: This patch needs to be fixed. optflags argument
|
|
|
# -mtune=generic is being ignored because it breaks several graphical
|
|
@@ -194,9 +189,11 @@ BuildRequires: libXi-devel
|
|
|
BuildRequires: libXp-devel
|
|
|
BuildRequires: libXt-devel
|
|
|
BuildRequires: libXtst-devel
|
|
|
+BuildRequires: libXrandr-devel
|
|
|
+BuildRequires: freetype2-devel
|
|
|
BuildRequires: libjpeg-devel
|
|
|
BuildRequires: libpng-devel
|
|
|
-BuildRequires: wget
|
|
|
+BuildRequires: unzip
|
|
|
BuildRequires: xalan-j2
|
|
|
BuildRequires: xerces-j2
|
|
|
BuildRequires: xorg-x11-proto-devel
|
|
@@ -224,11 +221,6 @@ BuildRequires: java-1.6.0-openjdk-devel
|
|
|
#BuildRequires: pkgconfig >= 0.9.0
|
|
|
#BuildRequires: xorg-x11-utils
|
|
|
|
|
|
-# IcedTeaPlugin build requirements.
|
|
|
-BuildRequires: gecko-devel
|
|
|
-BuildRequires: glib2-devel
|
|
|
-BuildRequires: gtk2-devel
|
|
|
-BuildRequires: xulrunner-devel
|
|
|
# PulseAudio build requirements.
|
|
|
BuildRequires: pulseaudio-libs-devel >= 0.9.11
|
|
|
BuildRequires: pulseaudio >= 0.9.11
|
|
@@ -576,11 +568,6 @@ done
|
|
|
|
|
|
# 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 ''\
|
|
|
- --dir $RPM_BUILD_ROOT%{_datadir}/applications javaws.desktop
|
|
|
-desktop-file-install --vendor ''\
|
|
|
- --dir $RPM_BUILD_ROOT%{_datadir}/applications visualvm.desktop
|
|
|
for e in jconsole policytool ; do
|
|
|
desktop-file-install --vendor=fedora --mode=644 \
|
|
|
--dir=$RPM_BUILD_ROOT%{_datadir}/applications $e.desktop
|
|
@@ -594,7 +581,6 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
|
|
|
# Find JRE files.
|
|
|
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
|
|
|
| grep -v jre/lib/security \
|
|
|
- | grep -v IcedTeaPlugin.so \
|
|
|
| sed 's|'$RPM_BUILD_ROOT'||' \
|
|
|
>> %{name}.files
|
|
|
# Find demo directories.
|
|
@@ -854,33 +840,6 @@ fi
|
|
|
|
|
|
exit 0
|
|
|
|
|
|
-%post plugin
|
|
|
-if [ $1 -gt 1 ]; then
|
|
|
- /sbin/update-alternatives --remove %{javaplugin} \
|
|
|
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so 2>/dev/null
|
|
|
-fi
|
|
|
-/sbin/update-alternatives --remove %{javaplugin} \
|
|
|
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaNPPlugin.so 2>/dev/null
|
|
|
-/sbin/update-alternatives \
|
|
|
- --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
|
|
|
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
|
|
|
-
|
|
|
-# fix broken symlink if it's there
|
|
|
-if [ ! -f %{syslibdir}/mozilla/plugins/libjavaplugin.so ] ; then
|
|
|
- /sbin/update-alternatives --auto %{javaplugin}
|
|
|
-fi
|
|
|
-
|
|
|
-exit 0
|
|
|
-
|
|
|
-%postun plugin
|
|
|
-if [ $1 -eq 0 ]; then
|
|
|
- /sbin/update-alternatives --remove %{javaplugin} \
|
|
|
- %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
|
|
|
- /sbin/update-alternatives --auto %{javaplugin}
|
|
|
-fi
|
|
|
-
|
|
|
-exit 0
|
|
|
-
|
|
|
%files -f %{name}.files
|
|
|
%defattr(-,root,root,-)
|
|
|
%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
|
|
@@ -913,8 +872,6 @@ exit 0
|
|
|
%{_mandir}/man1/servertool-%{name}.1*
|
|
|
%{_mandir}/man1/tnameserv-%{name}.1*
|
|
|
%{_mandir}/man1/unpack200-%{name}.1*
|
|
|
-%{_datadir}/pixmaps/javaws.png
|
|
|
-%{_datadir}/applications/javaws.desktop
|
|
|
%{_jvmdir}/%{jredir}/lib/security/nss.cfg
|
|
|
|
|
|
%files devel
|
|
@@ -970,7 +927,6 @@ exit 0
|
|
|
%{_mandir}/man1/wsgen-%{name}.1*
|
|
|
%{_mandir}/man1/wsimport-%{name}.1*
|
|
|
%{_mandir}/man1/xjc-%{name}.1*
|
|
|
-%{_datadir}/applications/visualvm.desktop
|
|
|
%ifarch %{jit_arches}
|
|
|
%{tapsetdir}/*.stp
|
|
|
%endif
|
|
@@ -993,11 +949,12 @@ exit 0
|
|
|
%defattr(-,root,root,-)
|
|
|
%doc %{_javadocdir}/%{name}
|
|
|
|
|
|
-%files plugin
|
|
|
-%defattr(-,root,root,-)
|
|
|
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
|
|
|
-
|
|
|
%changelog
|
|
|
+* Sat Apr 23 2011 NAKAMURA Kenta <kenta@vinelinux.org> - 1.6.0.0-4.b22
|
|
|
+- updated to IcedTea6 1.10.1
|
|
|
+- updated to openjdk b22
|
|
|
+- removed plugin
|
|
|
+
|
|
|
* Sat Sep 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0.0-3.b18
|
|
|
- rebuilt by java-1.6.0-openjdk (itself)
|
|
|
|