From 1087fe0c8a73eabbed624621c27de7905caaca95 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Tue, 25 Jun 2013 17:10:35 +0200 Subject: [PATCH] flashplugin: update to 11.2.202.291 sun-java7: update to 7u25 virtualbox-extension-pack: update to 4.2.14 Conflicts: VERSION --- SRPMS/sun-java7/sun-java7.spec.in | 6 +++--- SRPMSVERSIONS | 6 +++--- SRPMSVERSIONS.arm | 2 +- VERSION | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in index c00233b..f2065b9 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}-b02/jdk-%{version}-linux-i586.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/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}-b02/jdk-%{version}-linux-x64.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/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}-b18/jdk-%{version}-linux-arm-sfp.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b15/jdk-%{version}-linux-arm-sfp.tar.gz tar xf jdk-%{version}-linux-arm-sfp.tar.gz %endif diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS index 1244309..9c8b58d 100644 --- a/SRPMSVERSIONS +++ b/SRPMSVERSIONS @@ -1,5 +1,5 @@ -FLASHPLUGIN_VERSION=11.2.202.285 +FLASHPLUGIN_VERSION=11.2.202.291 WIN32CODECS_VERSION=20110131 SKYPE_VERSION=4.2.0.11 -VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0 -SUN_JAVA7_VERSION=7u17 +VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.14 +SUN_JAVA7_VERSION=7u25 diff --git a/SRPMSVERSIONS.arm b/SRPMSVERSIONS.arm index f48f908..03930d3 100644 --- a/SRPMSVERSIONS.arm +++ b/SRPMSVERSIONS.arm @@ -2,4 +2,4 @@ FLASHPLUGIN_VERSION=11.2.202.280 WIN32CODECS_VERSION=20110131 SKYPE_VERSION=4.1.0.20 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0 -SUN_JAVA7_VERSION=7u10 +SUN_JAVA7_VERSION=7u25 diff --git a/VERSION b/VERSION index a416a03..bc14503 100644 --- a/VERSION +++ b/VERSION @@ -1 +1,5 @@ +<<<<<<< HEAD VERSION = 2.3.22 +======= +VERSION = 2.3.93 +>>>>>>> d96f76c... flashplugin: update to 11.2.202.291