Author: glen Date: Mon Jul 2 14:39:18 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.6.0.33, sources uploaded via distfiles;
- demos and samples available separately with bsd license, not packaging here
as:
a) should update to 1.7, b) spec should be named java-oracle (or oracle-java?)
---- Files affected:
packages/java-sun:
java-sun.spec (1.287 -> 1.288)
---- Diffs:
================================================================
Index: packages/java-sun/java-sun.spec
diff -u packages/java-sun/java-sun.spec:1.287
packages/java-sun/java-sun.spec:1.288
--- packages/java-sun/java-sun.spec:1.287 Fri Mar 9 12:57:18 2012
+++ packages/java-sun/java-sun.spec Mon Jul 2 16:39:12 2012
@@ -7,26 +7,31 @@
# - the packaging is messy, but if you've built package, check that no file
is packaged to two diferent packages:
# rpm -qp --qf '[%{FILENAMES} %{name}\n]' *.rpm > fl; awk '{print $1}'
fl | sort | uniq -c | grep -v ' 1 '
# unless _duplicate_files_terminate_build macro gets implemented :P
+# - early access packages downloadable: http://jdk6.java.net/download.html
+# - sample/demo available as separate download, licensesd with Oracle BSD
license
#
# Conditional build:
%bcond_without tests # build without tests
-%define _src_ver 6u31
-%define _sub_ver b04
-%define _dir_ver %(echo %{version} | sed
's/\\.\\(..\\)$/_\\1/')
+%define src_ver 6u33
+%define sub_ver b03
+%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: Oracle JDK (Java Development Kit) for Linux
Summary(pl.UTF-8): Oracle JDK - środowisko programistyczne Javy dla Linuksa
Name: java-sun
-Version: 1.6.0.31
-Release: 3
+Version: 1.6.0.33
+Release: 1
License: restricted, distributable
-Group: Development/Languages/Java
-Source0:
http://download.oracle.com/otn-pub/java/jdk/%{_src_ver}-%{_sub_ver}/jdk-%{_src_ver}-linux-i586.bin
-# Source0-md5: 9e4246fc7a6c0759b8a484ff5e820112
-Source1:
http://download.oracle.com/otn-pub/java/jdk/%{_src_ver}-%{_sub_ver}/jdk-%{_src_ver}-linux-x64.bin
-# Source1-md5: 2f74dbbee4142b7366c93b115f914fff
+# http://www.oracle.com/technetwork/java/javase/terms/license/index.html
+# See "LICENSE TO DISTRIBUTE SOFTWARE" section, which states you can
+# redistribute in unmodified form.
+Group: Development/Languages/Java
+Source0:
http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{sub_ver}/jdk-%{src_ver}-linux-i586.bin
+# Source0-md5: 276d31fabcc1f10b401c1e8b7680e460
+Source1:
http://download.oracle.com/otn-pub/java/jdk/%{src_ver}-%{sub_ver}/jdk-%{src_ver}-linux-x64.bin
+# Source1-md5: b6764210dc436d43b5bb8caa1cc1f461
Source2: Test.java
Source3: Test.class
Patch0: %{name}-desktop.patch
@@ -365,7 +370,7 @@
Źródła standardowej bilioteki Java.
%prep
-%setup -q -T -c -n jdk%{_dir_ver}
+%setup -q -T -c -n jdk%{dir_ver}
cd ..
%ifarch %{ix86}
%{__unzip} -q %{SOURCE0} || :
@@ -414,9 +419,9 @@
$RPM_BUILD_ROOT{%{_mandir}/{,ja/}man1,%{_prefix}/src/%{name}-sources} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_browserpluginsdir}}
-cp -a bin sample demo include lib $RPM_BUILD_ROOT%{javadir}
-install man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
-install man/ja/man1/* $RPM_BUILD_ROOT%{_mandir}/ja/man1
+cp -a bin include lib $RPM_BUILD_ROOT%{javadir}
+cp -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p man/ja/man1/* $RPM_BUILD_ROOT%{_mandir}/ja/man1
if test -f jre/lib/%{arch}/client/Xusage.txt; then
mv -f jre/lib/%{arch}/client/Xusage.txt jre/Xusage.client
@@ -934,6 +939,7 @@
%lang(ja) %{_mandir}/ja/man1/jvisualvm.1*
%{javadir}/lib/visualvm
+%if 0
%files demos
%defattr(644,root,root,755)
%dir %{javadir}/demo
@@ -954,6 +960,7 @@
%{javadir}/demo/applets.html
%{javadir}/demo/scripting
%{javadir}/sample
+%endif
%files tools
%defattr(644,root,root,755)
@@ -1001,6 +1008,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.288 2012/07/02 14:39:12 glen
+- up to 1.6.0.33, sources uploaded via distfiles;
+- demos and samples available separately with bsd license, not packaging here
as:
+ a) should update to 1.7, b) spec should be named java-oracle (or
oracle-java?)
+
Revision 1.287 2012/03/09 11:57:18 baggins
- rel 3
- get rid of odbc hacks, libodbc*.so are now in main unixODBC package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/java-sun/java-sun.spec?r1=1.287&r2=1.288
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
