From 2e6bb8c088a3cd680bb72d22485ea3545e5024a7 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 3 Nov 2013 16:42:09 +0100 Subject: [PATCH] sun-java7: update to 7u45 Conflicts: SRPMSVERSIONS --- SRPMS/sun-java7/sun-java7.spec.in | 6 +++--- SRPMSVERSIONS | 2 +- SRPMSVERSIONS.arm | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in index f2065b9..78a0e17 100644 --- a/SRPMS/sun-java7/sun-java7.spec.in +++ b/SRPMS/sun-java7/sun-java7.spec.in @@ -69,19 +69,19 @@ Sun Java Platform Runtime Environment. %ifarch %{ix86} wget -nv --tries=2 --no-cookies --header \ "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \ - http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-i586.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-i586.tar.gz tar xf jdk-%{version}-linux-i586.tar.gz %endif %ifarch x86_64 wget -nv --tries=2 --no-cookies --header \ "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \ - http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-x64.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-x64.tar.gz tar xf jdk-%{version}-linux-x64.tar.gz %endif %ifarch arm wget -nv --tries=2 --no-cookies --header \ "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \ - http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-arm-sfp.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-arm-sflt.tar.gz tar xf jdk-%{version}-linux-arm-sfp.tar.gz %endif diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS index 2cf9629..58b56b4 100644 --- a/SRPMSVERSIONS +++ b/SRPMSVERSIONS @@ -2,5 +2,5 @@ FLASHPLUGIN_VERSION=11.2.202.310 WIN32CODECS_VERSION=20110131 SKYPE_VERSION=4.2.0.11 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0 -SUN_JAVA7_VERSION=7u25 +SUN_JAVA7_VERSION=7u45 SPOTIFY_VERSION=20131103 diff --git a/SRPMSVERSIONS.arm b/SRPMSVERSIONS.arm index 58e8e97..9c0a7f9 100644 --- a/SRPMSVERSIONS.arm +++ b/SRPMSVERSIONS.arm @@ -1 +1 @@ -SUN_JAVA7_VERSION=7u25 +SUN_JAVA7_VERSION=7u45