X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=adobe-flash.spec;h=078ac64f1e65a4e2ea5087b609bff17e08562341;hb=1bbc1683f0fc154201e211d9f0f40a827fb628bf;hp=8278433b8be8faad5f94317c8404d8f73937f8db;hpb=ad69bdf5ba09af5ab3e3bbcbdf85ec479ca58b11;p=packages%2Fadobe-flash.git

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 8278433..078ac64 100644
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,48 +1,45 @@
-#
+# 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.285
-%define		ver64	11.2.202.285
-
 %ifarch %{ix86}
-%define		version	%{ver32}
 %define		libmark	%{nil}
 %endif
 %ifarch %{x8664}
-%define		version	%{ver64}
 %define		libmark	()(64bit)
 %endif
 
 %define		base_name	adobe-flash
 %define		rel 1
-Summary:	Flash plugin for Netscape-compatible WWW browsers
-Summary(pl.UTF-8):	Wtyczka Flash dla przeglądarek WWW zgodnych z Netscape
+Summary:	Flash (NPAPI based) plugin for Netscape-compatible WWW browsers
+Summary(pl.UTF-8):	Wtyczka Flash oparta na NPAPI dla przeglądarek WWW zgodnych z Netscape
 %if %{with license_agreement}
 Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	%{version}
+Version:	31.0.0.113
 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:	4e3691afc05486be0258e66186d13644
+Source0:	https://fpdownload.macromedia.com/pub/labs/flashruntimes/flashplayer/linux32/flash_player_npapi_linux.i386.tar.gz?/flash-%{version}.i386.tar.gz
+# NoSource0-md5:	0d1b35f93e588ab06a2215d76cfe6aff
 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:	3fe4e07a3ddf07fd2c7c3b7b8b4cf5b4
+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:	591c786037bb06b10c61d2eca80bd0fb
 NoSource:	1
 %else
 Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
 # Source3-md5:	39dd73d36280769d0f74d642c7b0c6d3
 %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 +53,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
@@ -78,10 +76,14 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Adobe(R) Flash(R) Player for Linux - the next-generation client
 runtime for engaging with Flash content and applications on Linux.
 
+This package contains NPAPI based plugin.
+
 %description -l pl.UTF-8
 Adobe(R) Flash(R) Player - środowisko nowej generacji do obsługi
 treści i aplikacji we Flashu pod Linuksem.
 
+Ten pakiet zawiera wtyczkę opartą na NPAPI.
+
 %prep
 %if %{with license_agreement}
 %ifarch %{x8664}
@@ -92,8 +94,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
@@ -116,16 +118,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,10 +155,11 @@ 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
-%attr(755,root,root) %{_browserpluginsdir}/*.so
+%attr(755,root,root) %{_browserpluginsdir}/libflashplayer.so
 %{_desktopdir}/flash-player-properties.desktop
-%{_iconsdir}/hicolor/*/apps/*.png
+%{_iconsdir}/hicolor/*/apps/flash-player-properties.png
 %endif