up to 24.0.0.154

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

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 5d9eca8f9277d61dd3caae78344c9f50d291978b..3f444922d2a7eee5a7297831a7e2dca799280574 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,18 +1,14 @@
-#
+# NOTES:
+# - release archives: http://helpx.adobe.com/flash-player/kb/archived-flash-player-versions.html
 # TODO: package kde4 component
 #
 # Conditional build:
 %bcond_with    license_agreement       # generates package
 
-%define                ver32   11.2.202.424
-%define                ver64   11.2.202.424
-
 %ifarch %{ix86}
-%define                version %{ver32}
 %define                libmark %{nil}
 %endif
 %ifarch %{x8664}
-%define                version %{ver64}
 %define                libmark ()(64bit)
 %endif
 
@@ -25,24 +21,27 @@ Name:               %{base_name}
 %else
 Name:          %{base_name}-installer
 %endif
-Version:       %{version}
+Version:       24.0.0.154
 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}.tgz
-# NoSource0-md5:       fd78f43eafd9fe337e2ddf8997fa48d9
+#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:       5cef1ebc9e196c31a62ac6fdc322d03f
 NoSource:      0
-Source1:       http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver64}/install_flash_player_11_linux.x86_64.tar.gz?/flash64-%{version}.tgz
-# NoSource1-md5:       191d3b5dcec03e7eb4c66750e28af1aa
+#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:       9e55ca69d4528e08e7a00959934044ad
 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
@@ -56,6 +55,7 @@ Requires:     libcurl.so.4%{libmark}
 Requires:      rpm-build-tools >= 4.4.37
 Requires:      rpmbuild(macros) >= 1.544
 %endif
+Requires:      cpuinfo(sse2)
 Provides:      browser(flash)
 Provides:      macromedia-flash
 Obsoletes:     flash-plugin
@@ -116,16 +116,16 @@ sed -e '
 ' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 cp -p %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
-install %{PATCH0} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+cp -p %{PATCH0} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
 
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_browserpluginsdir},%{_bindir},%{_desktopdir},%{_iconsdir}}
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
 install -p *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
-install usr/bin/flash-player-properties $RPM_BUILD_ROOT%{_bindir}
-install usr/share/applications/flash-player-properties.desktop $RPM_BUILD_ROOT%{_desktopdir}/flash-player-properties.desktop
+install -p usr/bin/flash-player-properties $RPM_BUILD_ROOT%{_bindir}
+cp -p usr/share/applications/flash-player-properties.desktop $RPM_BUILD_ROOT%{_desktopdir}/flash-player-properties.desktop
 cp -a usr/share/icons/* $RPM_BUILD_ROOT%{_iconsdir}
 %endif
 
@@ -153,6 +153,7 @@ fi
 %attr(755,root,root) %{_bindir}/%{base_name}.install
 %{_datadir}/%{base_name}
 %else
+%doc readme.txt
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mms.cfg
 %attr(755,root,root) %{_bindir}/flash-player-properties