SPECS: java-sun.spec - updated to 1.6.0.12 - release 0.1, check new TODO entry
hawk
hawk at pld-linux.org
Thu Feb 5 12:38:39 CET 2009
Author: hawk Date: Thu Feb 5 11:38:38 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- updated to 1.6.0.12
- release 0.1, check new TODO entry
---- Files affected:
SPECS:
java-sun.spec (1.215 -> 1.216)
---- Diffs:
================================================================
Index: SPECS/java-sun.spec
diff -u SPECS/java-sun.spec:1.215 SPECS/java-sun.spec:1.216
--- SPECS/java-sun.spec:1.215 Mon Dec 8 16:04:38 2008
+++ SPECS/java-sun.spec Thu Feb 5 12:38:33 2009
@@ -9,24 +9,28 @@
# /usr/lib/jvm/java-sun-1.6.0.10/jre/lib/servicetag/jdk_header.png
# - dep loop (can be solved by moving shared libs to java-sun-libs):
# java-sun-jre>java-sun-tools
+# - package both old and new browser plugin for x86 (x86_64 has only new
+# plugin)
#
%define _enable_debug_packages 0
#
-%define _src_ver 6u11
+%define _src_ver 6u12
%define _dir_ver %(echo %{version} | sed 's/\\.\\(..\\)$/_\\1/')
# class data version seen with file(1) that this jvm is able to load
%define _classdataversion 50.0
Summary: Sun JDK (Java Development Kit) for Linux
Summary(pl.UTF-8): Sun JDK - środowisko programistyczne Javy dla Linuksa
Name: java-sun
-Version: 1.6.0.11
-Release: 1
+Version: 1.6.0.12
+Release: 0.1
License: restricted, distributable
Group: Development/Languages/Java
-Source0: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
-# Source0-md5: e5eef98bc477675c66e053fc3635e645
-Source1: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin
-# Source1-md5: 0f687b6dbfe54e117bb0d9e090fda20b
+#Source0: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-i586.bin
+Source0: jdk-%{_src_ver}-linux-i586.bin
+# Source0-md5: 1ee8b1952cf5143631dcd883f02a8bc0
+#Source1: http://download.java.net/dlj/binaries/jdk-%{_src_ver}-dlj-linux-amd64.bin
+Source1: jdk-%{_src_ver}-linux-x64.bin
+# Source1-md5: 4a4103b3d50d01f9a97cb62fb544d135
Source2: Test.java
Patch0: %{name}-desktop.patch
URL: https://jdk-distros.dev.java.net/developer.html
@@ -164,9 +168,7 @@
Group: Development/Languages/Java
Requires: %{name}-jre = %{version}-%{release}
Provides: jre-X11 = %{version}
-%ifarch %{ix86}
Provides: javaws = %{version}
-%endif
%description jre-X11
X11-related part of Java Runtime Environment for Linux.
@@ -279,11 +281,9 @@
%{__unzip} -q %{SOURCE1} || :
%endif
cd -
-%ifarch %{ix86}
# patch only copy of the desktop file, leave original unchanged
cp jre/plugin/desktop/sun_java.desktop .
%patch0 -p1
-%endif
# unpack packed jar files -- in %%prep as it is done "in place"
for pack in $(find . -name '*.pack'); do
@@ -327,9 +327,7 @@
cp -af jre/{bin,lib} $RPM_BUILD_ROOT%{jredir}
for i in java keytool orbd policytool \
-%ifarch %{ix86}
java_vm javaws \
-%endif
rmid rmiregistry servertool tnameserv pack200 unpack200; do
[ -f $RPM_BUILD_ROOT%{jredir}/bin/$i ] || exit 1
ln -sf %{jredir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
@@ -342,40 +340,43 @@
[ -f $RPM_BUILD_ROOT%{javadir}/bin/$i ] || exit 1
ln -sf %{javadir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
done
+
%ifarch %{ix86}
for i in HtmlConverter jcontrol java-rmi.cgi; do
[ -f $RPM_BUILD_ROOT%{javadir}/bin/$i ] || exit 1
ln -sf %{javadir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
done
%endif
+%ifarch %{x8664}
+for i in HtmlConverter jcontrol; do
+ [ -f $RPM_BUILD_ROOT%{javadir}/bin/$i ] || exit 1
+ ln -sf %{javadir}/bin/$i $RPM_BUILD_ROOT%{_bindir}/$i
+done
+%endif
# make sure all tools are available under $(JDK_HOME)/bin
for i in keytool orbd policytool rmid \
-%ifarch %{ix86}
java_vm javaws \
-%endif
rmiregistry servertool tnameserv pack200 unpack200 java; do
[ -f $RPM_BUILD_ROOT%{jredir}/bin/$i ] || exit 1
ln -sf ../jre/bin/$i $RPM_BUILD_ROOT%{javadir}/bin/$i
done
-%ifnarch %{ix86}
-# only manual available on this platform
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/javaws.1
-%endif
-
-%ifarch %{ix86}
# copy _all_ plugin files (even those incompatible with PLD) --
# license restriction
cp -a jre/plugin $RPM_BUILD_ROOT%{jredir}
# Install plugin for browsers
# Plugin in regular location simply does not work (is seen by browsers):
+%ifarch %{ix86}
ln -sf %{jredir}/plugin/i386/ns7/libjavaplugin_oji.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+%endif
+%ifarch %{x8664}
+ln -sf %{jredir}/lib/amd64/libnpjp2.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+%endif
cp -a *.desktop $RPM_BUILD_ROOT%{_desktopdir}
cp -a jre/plugin/desktop/*.png $RPM_BUILD_ROOT%{_pixmapsdir}
-%endif
ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jsse.jar
ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jcert.jar
@@ -387,7 +388,6 @@
ln -sf %{jredir}/lib/rt.jar $RPM_BUILD_ROOT%{jvmjardir}/$f.jar
done
-%ifarch %{ix86}
install -d $RPM_BUILD_ROOT%{jredir}/javaws
cp -a jre/javaws/* $RPM_BUILD_ROOT%{jredir}/javaws
ln -sf %{jredir}/lib/javaws.jar $RPM_BUILD_ROOT%{jvmjardir}/javaws.jar
@@ -404,7 +404,6 @@
mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh,zh_CN}
mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh_HK.BIG5HK,zh_HK}
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/{ko.UTF-8,zh.GBK,zh_TW.BIG5}
-%endif
cp -a src.zip $RPM_BUILD_ROOT%{_prefix}/src/%{name}-sources
@@ -480,8 +479,8 @@
%doc COPYRIGHT LICENSE README.html
%{_jvmdir}/java
%{_jvmjardir}/java
-%ifarch %{ix86}
%attr(755,root,root) %{_bindir}/HtmlConverter
+%ifarch %{ix86}
%attr(755,root,root) %{_bindir}/java-rmi.cgi
%endif
%attr(755,root,root) %{_bindir}/apt
@@ -509,8 +508,8 @@
%attr(755,root,root) %{_bindir}/wsgen
%attr(755,root,root) %{_bindir}/wsimport
%attr(755,root,root) %{_bindir}/xjc
-%ifarch %{ix86}
%attr(755,root,root) %{javadir}/bin/HtmlConverter
+%ifarch %{ix86}
%attr(755,root,root) %{javadir}/bin/java-rmi.cgi
%endif
%attr(755,root,root) %{javadir}/bin/apt
@@ -659,14 +658,12 @@
%exclude %{jredir}/lib/%{arch}/libjsoundalsa.so
%ifarch %{ix86}
%attr(755,root,root) %{jredir}/lib/%{arch}/client
+%endif
%attr(755,root,root) %{jredir}/lib/%{arch}/libsplashscreen.so
%exclude %{jredir}/lib/%{arch}/libjavaplugin*.so
-%endif
-%ifarch %{ix86}
%{jredir}/lib/deploy
%{jredir}/lib/desktop
-%endif
%{jredir}/lib/im
%{jredir}/lib/images
%attr(755,root,root) %{jredir}/lib/jexec
@@ -733,6 +730,7 @@
%defattr(644,root,root,755)
%ifarch %{ix86}
%doc jre/Xusage*
+%endif
%attr(755,root,root) %{_bindir}/java_vm
%attr(755,root,root) %{_bindir}/javaws
%attr(755,root,root) %{_bindir}/jcontrol
@@ -746,7 +744,6 @@
%attr(755,root,root) %{javadir}/bin/jcontrol
%{_desktopdir}/sun_java.desktop
%{_pixmapsdir}/sun_java.png
-%endif
%attr(755,root,root) %{_bindir}/jvisualvm
%attr(755,root,root) %{_bindir}/policytool
%attr(755,root,root) %{jredir}/bin/policytool
@@ -762,12 +759,9 @@
%dir %{jredir}/lib/%{arch}/xawt
%dir %{jredir}/lib/%{arch}/motif21
%attr(755,root,root) %{jredir}/lib/%{arch}/libsplashscreen.so
-%ifarch %{ix86}
%{jvmjardir}/javaws.jar
-%endif
%attr(755,root,root) %{jredir}/lib/%{arch}/motif21/libmawt.so
%attr(755,root,root) %{jredir}/lib/%{arch}/xawt/libmawt.so
-%ifarch %{ix86}
%dir %{jredir}/lib/locale
%lang(de) %{jredir}/lib/locale/de
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/sunw_java_plugin.mo
@@ -790,11 +784,10 @@
%lang(zh_TW) %{jredir}/lib/locale/zh_TW*
%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/sunw_java_plugin.mo
%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
-%endif
-%ifarch %{ix86}
%dir %{jredir}/javaws
%attr(755,root,root) %{jredir}/javaws/javaws
%{_mandir}/man1/javaws.1*
+%ifarch %{ix86}
%lang(ja) %{_mandir}/ja/man1/javaws.1*
%endif
@@ -817,10 +810,8 @@
%{javadir}/demo/jvmti/*/*.jar
%{javadir}/demo/management
%{javadir}/demo/nbproject
-%ifarch %{ix86}
%{javadir}/demo/plugin
%{javadir}/demo/applets.html
-%endif
%{javadir}/demo/scripting
%{javadir}/sample
@@ -839,18 +830,21 @@
%lang(ja) %{_mandir}/ja/man1/rmic.1*
%lang(ja) %{_mandir}/ja/man1/rmiregistry.1*
-%ifarch %{ix86}
%files -n browser-plugin-%{name}
%defattr(644,root,root,755)
%dir %{jredir}/plugin
+%attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so
+%ifarch %{x8664}
+%attr(755,root,root) %{jredir}/lib/%{arch}/libnpjp2.so
+%endif
+%ifarch %{ix86}
%dir %{jredir}/plugin/%{arch}
%dir %{jredir}/plugin/%{arch}/ns7
%dir %{jredir}/plugin/%{arch}/ns7-gcc29
-%attr(755,root,root) %{jredir}/lib/%{arch}/libjavaplugin*.so
%attr(755,root,root) %{jredir}/plugin/%{arch}/*/libjavaplugin_oji.so
+%endif
%{jredir}/plugin/desktop
%attr(755,root,root) %{_browserpluginsdir}/*.so
-%endif
%files sources
%defattr(644,root,root,755)
@@ -863,6 +857,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.216 2009/02/05 11:38:33 hawk
+- updated to 1.6.0.12
+- release 0.1, check new TODO entry
+
Revision 1.215 2008/12/08 15:04:38 blues
- 1.6.0.11 ; fixes:
CVE-2008-2086, CVE-2008-5345, CVE-2008-5347, CVE-2008-5348, CVE-2008-5349,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-sun.spec?r1=1.215&r2=1.216&f=u
More information about the pld-cvs-commit
mailing list