- up to 25.0.0.152

[packages/adobe-flash.git] / adobe-flash.spec

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 19fc4628c1b620a413472b3edc20644db849530a..7565b3f85c0b1aa9ea7d64ba3d623561cfa1de00 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -5,15 +5,10 @@
 # Conditional build:
 %bcond_with    license_agreement       # generates package
 
-%define                ver32   11.2.202.535
-%define                ver64   11.2.202.535
-
 %ifarch %{ix86}
-%define                version %{ver32}
 %define                libmark %{nil}
 %endif
 %ifarch %{x8664}
-%define                version %{ver64}
 %define                libmark ()(64bit)
 %endif
 
@@ -26,24 +21,27 @@ Name:               %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
-Version:       %{version}
+Version:       25.0.0.152
 Release:       %{rel}%{?with_license_agreement:wla}
 Epoch:         1
 License:       Free to use, non-distributable
 Group:         X11/Applications/Multimedia
 %if %{with license_agreement}
-Source0:       http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver32}/install_flash_player_11_linux.i386.tar.gz?/flash-%{version}.i386.tar.gz
-# NoSource0-md5:       
+#Source0:      http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/install_flash_player_11_linux.i386.tar.gz?/flash-%{version}.i386.tar.gz
+Source0:       https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux32/flash_player_npapi_linux.i386.tar.gz?/flash-%{version}.i386.tar.gz
+# NoSource0-md5:       be62fad8bcf8c382811ab59a5f3905ce
 NoSource:      0
-Source1:       http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver64}/install_flash_player_11_linux.x86_64.tar.gz?/flash-%{version}.x86_64.tar.gz
-# NoSource1-md5:       
+#Source1:      http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/install_flash_player_11_linux.x86_64.tar.gz?/flash-%{version}.x86_64.tar.gz
+Source1:       https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux64/flash_player_npapi_linux.x86_64.tar.gz?/flash-%{version}.x86_64.tar.gz
+# NoSource1-md5:       622577ace52ff19236edaaa5227caf97
 NoSource:      1
 %else
 Source3:       http://svn.pld-linux.org/svn/license-installer/license-installer.sh
 # Source3-md5: 329c25f457fea66ec502b7ef70cb9ede
 %endif
 Source2:       mms.cfg
-URL:           http://www.adobe.com/products/flashplayer/
+#URL:          http://www.adobe.com/products/flashplayer/
+URL:           http://labs.adobe.com/downloads/flashplayer.html
 Patch0:                desktop.patch
 %if %{with license_agreement}
 BuildRequires: rpmbuild(macros) >= 1.357
@@ -94,8 +92,8 @@ treści i aplikacji we Flashu pod Linuksem.
 %patch0 -p1
 
 %build
-s=$(echo 'LNX %{version}' | tr . ,)
-v=$(strings libflashplayer.so | grep '^LNX ')
+s=$(echo '%{version}' | tr . ,)
+v=$(strings libflashplayer.so | grep -m 1 'LNX ' | sed 's/.*LNX //')
 if [ "$v" != "$s" ]; then
        : wrong version
        exit 1