|
|
@@ -1,16 +1,16 @@
|
|
|
%define origin sun
|
|
|
%define priority 1600
|
|
|
%define javaver 1.6.0
|
|
|
-%define cvsver 6u20
|
|
|
+%define cvsver 6u21
|
|
|
%define over %{cvsver}
|
|
|
-%define buildver 20
|
|
|
+%define buildver 21
|
|
|
|
|
|
%define cvsversion %{cvsver}
|
|
|
|
|
|
%define javaws_ver %{javaver}
|
|
|
%define javaws_version %{cvsversion}
|
|
|
|
|
|
-%define ubuntu_svnrev r273
|
|
|
+%define ubuntu_svnrev r364
|
|
|
|
|
|
%define jdkbundle jdk%{javaver}_%{buildver}
|
|
|
%define sdklnk java-%{javaver}-%{origin}
|
|
|
@@ -55,9 +55,6 @@ Source1: http://download.java.net/dlj/binaries/jdk-%{cvsversion}-dlj-linu
|
|
|
Source2: jdk-6-dlj-ubuntu-%{ubuntu_svnrev}.tar.bz2
|
|
|
# fontconfig.properties
|
|
|
Source10: fontconfig.Vine5.properties
|
|
|
-# (anssi) make javaws entry really point to javaws and create a different
|
|
|
-# entry for the cache viewer where to it pointed previously (#31347):
|
|
|
-Patch0: jdk6-fix-javaws-desktop.patch
|
|
|
Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
|
|
|
Provides: jre-%{origin} = %{version}-%{release}
|
|
|
Provides: jre-%{javaver} java-%{javaver} jre = %{javaver}
|
|
|
@@ -201,7 +198,6 @@ This package contains the JDBC/ODBC bridge driver for %{name}.
|
|
|
|
|
|
%prep
|
|
|
%setup -q -T -c -n %{name}-%{version} -a2
|
|
|
-%patch0 -p0
|
|
|
%ifarch %{ix86}
|
|
|
sh %{SOURCE0} --accept-license --unpack
|
|
|
%else
|
|
|
@@ -609,6 +605,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Aug 18 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6.0.21-1
|
|
|
+- update to 6u21
|
|
|
+- update to jdk-6-dlj-ubuntu r364
|
|
|
+
|
|
|
* Wed Apr 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6.0.20-1
|
|
|
- update to 6u20
|
|
|
|
daisuke