flashplugin: update to 11.2.202.291

sun-java7: update to 7u25
virtualbox-extension-pack: update to 4.2.14

Conflicts:
	VERSION
This commit is contained in:
Silvan Calarco 2013-06-25 17:10:35 +02:00
parent 44daffa9b8
commit 1087fe0c8a
4 changed files with 11 additions and 7 deletions

View File

@ -69,19 +69,19 @@ Sun Java Platform Runtime Environment.
%ifarch %{ix86} %ifarch %{ix86}
wget -nv --tries=2 --no-cookies --header \ 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;" \ "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 tar xf jdk-%{version}-linux-i586.tar.gz
%endif %endif
%ifarch x86_64 %ifarch x86_64
wget -nv --tries=2 --no-cookies --header \ 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;" \ "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 tar xf jdk-%{version}-linux-x64.tar.gz
%endif %endif
%ifarch arm %ifarch arm
wget -nv --tries=2 --no-cookies --header \ 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;" \ "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 tar xf jdk-%{version}-linux-arm-sfp.tar.gz
%endif %endif

View File

@ -1,5 +1,5 @@
FLASHPLUGIN_VERSION=11.2.202.285 FLASHPLUGIN_VERSION=11.2.202.291
WIN32CODECS_VERSION=20110131 WIN32CODECS_VERSION=20110131
SKYPE_VERSION=4.2.0.11 SKYPE_VERSION=4.2.0.11
VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.14
SUN_JAVA7_VERSION=7u17 SUN_JAVA7_VERSION=7u25

View File

@ -2,4 +2,4 @@ FLASHPLUGIN_VERSION=11.2.202.280
WIN32CODECS_VERSION=20110131 WIN32CODECS_VERSION=20110131
SKYPE_VERSION=4.1.0.20 SKYPE_VERSION=4.1.0.20
VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
SUN_JAVA7_VERSION=7u10 SUN_JAVA7_VERSION=7u25

View File

@ -1 +1,5 @@
<<<<<<< HEAD
VERSION = 2.3.22 VERSION = 2.3.22
=======
VERSION = 2.3.93
>>>>>>> d96f76c... flashplugin: update to 11.2.202.291