Commit cedfb93b680c8f9eaecfad55c9ec85181a4822a9

Authored by Silvan Calarco
1 parent b5ddfe787c
Exists in master

sun-java7, sun-java8: update following upstream download url changes

Showing 4 changed files with 13 additions and 9 deletions Side-by-side Diff

SRPMS/sun-java7/sun-java7.spec.in
... ... @@ -61,23 +61,25 @@
61 61  
62 62 %setup -q -T -c
63 63  
  64 +DOWNLOAD_FRAGMENT=`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*|\1|"`
  65 +
64 66 #echo yes | MORE=10000
65 67 %ifarch %{ix86}
66 68 wget -nv --tries=2 --no-cookies --header \
67 69 "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
68   - http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-i586.tar.gz
  70 + http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-i586.tar.gz
69 71 tar xf jdk-%{realver}-linux-i586.tar.gz
70 72 %endif
71 73 %ifarch x86_64
72 74 wget -nv --tries=2 --no-cookies --header \
73 75 "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
74   - http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-x64.tar.gz
  76 + http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-x64.tar.gz
75 77 tar xf jdk-%{realver}-linux-x64.tar.gz
76 78 %endif
77 79 %ifarch arm
78 80 wget -nv --tries=2 --no-cookies --header \
79 81 "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
80   - http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
  82 + http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
81 83 tar xf jdk-%{realver}-linux-arm-sfp.tar.gz
82 84 %endif
83 85  
SRPMS/sun-java8/sun-java8.spec.in
... ... @@ -61,23 +61,25 @@
61 61  
62 62 %setup -q -T -c
63 63  
  64 +DOWNLOAD_FRAGMENT=`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|"`
  65 +
64 66 #echo yes | MORE=10000
65 67 %ifarch %{ix86}
66 68 wget -nv --tries=2 --no-cookies --header \
67 69 "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
68   - http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-i586.tar.gz
  70 + http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-i586.tar.gz
69 71 tar xf jdk-%{realver}-linux-i586.tar.gz
70 72 %endif
71 73 %ifarch x86_64
72 74 wget -nv --tries=2 --no-cookies --header \
73 75 "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
74   - http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-x64.tar.gz
  76 + http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-x64.tar.gz
75 77 tar xf jdk-%{realver}-linux-x64.tar.gz
76 78 %endif
77 79 %ifarch arm
78 80 wget -nv --tries=2 --no-cookies --header \
79 81 "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
80   - http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
  82 + http://download.oracle.com/otn-pub/java/jdk/${DOWNLOAD_FRAGMENT}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
81 83 tar xf jdk-%{realver}-linux-arm-sfp.tar.gz
82 84 %endif
83 85  
... ... @@ -23,12 +23,12 @@
23 23 SRPMRELEASE["spotify"]=1mamba
24 24 # sun-java7
25 25 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
26   - SRPMVERSION["sun-java7"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*||;s|-|_|" 2>/dev/null`"
  26 + SRPMVERSION["sun-java7"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*||;s|-|_|" 2>/dev/null`"
27 27 SRPMRELEASE["sun-java7"]=1mamba
28 28 fi
29 29 # sun-java8
30 30 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java8" ]; then
31   - SRPMVERSION["sun-java8"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*||;s|-|_|" 2>/dev/null`"
  31 + SRPMVERSION["sun-java8"]="`curl --max-time 20 -sL http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*||;s|-|_|" 2>/dev/null`"
32 32 SRPMRELEASE["sun-java8"]=1mamba
33 33 fi
34 34 # virtualbox-extension-pack
1 1 # sun-java7
2 2 if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
3   -SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*||;s|-|_|" 2>/dev/null`"
  3 +SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\([a-zA-Z0-9-]*\).*/jdk-.*||;s|-|_|" 2>/dev/null`"
4 4 SRPMRELEASE["sun-java7"]=1mamba
5 5 fi