X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adobe-flash.spec;h=e8dccd8706cbc2d7926415d88ff368511351af0c;hb=361299b8806a67d17e8c1f510f9c0c47ef8b3aca;hp=f6a95afca2b5978c50131eef11781d5b8ba6a23c;hpb=652f10734ca09e655b9090c5754adb406da08008;p=packages%2Fadobe-flash.git

diff --git a/adobe-flash.spec b/adobe-flash.spec
index f6a95af..e8dccd8 100644
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,21 +1,19 @@
+# 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.0.1.60
-%define		ver64	11.0.1.60
-
 %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 0.1
+%define		rel 1
 Summary:	Flash plugin for Netscape-compatible WWW browsers
 Summary(pl.UTF-8):	Wtyczka Flash dla przeglądarek WWW zgodnych z Netscape
 %if %{with license_agreement}
@@ -23,31 +21,33 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	%{version}
+Version:	25.0.0.119
 Release:	%{rel}%{?with_license_agreement:wla}
 Epoch:		1
 License:	Free to use, non-distributable
 Group:		X11/Applications/Multimedia
 %if %{with license_agreement}
-#Source0:	http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer10-3/flashplayer10-3_rc1_lin_042011.tar.gz
-Source0:	http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b1_install_lin_32_071311.tar.gz#/%{base_name}-%{ver32}.tgz
-# NoSource0-md5:	8816dfa0bbb4210df5a37e061834c24a
+#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:	69abb8d461eeffb81c3ff1d2fc9bda4f
 NoSource:	0
-##Source1:	http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-%{version}.linux-x86_64.so.tar.gz
-Source1:	http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b1_install_lin_64_071311.tar.gz#/%{base_name}64-%{ver64}.tgz
-# NoSource1-md5:	806b348cfb27054568d9f63d13bee3fd
+#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:	56a95b6b054b15f27a962dc17f9396d8
 NoSource:	1
-Source2:	mms.cfg
 %else
 Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
 # Source3-md5:	329c25f457fea66ec502b7ef70cb9ede
 %endif
-Source4:	memcpy-to-memmove.sh
-URL:		http://www.adobe.com/products/flashplayer/
+Source2:	mms.cfg
+#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
 BuildRequires:	sed >= 4.0
 Requires:	browser-plugins >= 2.0
+Requires:	hicolor-icon-theme
 # dlopened by player
 Requires:	libasound.so.2%{libmark}
 Requires:	libcurl.so.4%{libmark}
@@ -55,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
@@ -88,22 +89,15 @@ treści i aplikacji we Flashu pod Linuksem.
 %else
 %setup -q -T -c -b 0
 %endif
+%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
 fi
-
-%ifarch %{x8664}
-# Bug #354073: Patch binary to use memmove instead of memcpy from
-# Redhat's bug https://bugzilla.redhat.com/show_bug.cgi?id=638477#c94
-cp libflashplayer.so libflashplayer.so.orig
-/bin/bash %{SOURCE4} libflashplayer.so \
-|| (echo "memcpy-to-memmove.sh failed" && exit 1)
-%endif
 %endif
 
 %install
@@ -118,15 +112,21 @@ sed -e '
 	s-@RELEASE@-%{release}-g
 	s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
 	s,@DATADIR@,%{_datadir}/%{base_name},g
+	s,@COPYSOURCES@,mms.cfg desktop.patch,g
 ' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 cp -p %{_specdir}/%{base_name}.spec $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}}
+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 -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
 
 %clean
@@ -138,11 +138,13 @@ rm -rf $RPM_BUILD_ROOT
 %else
 %post
 %update_browser_plugins
+%update_icon_cache hicolor
 
 %postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
+%update_icon_cache hicolor
 %endif
 
 %files
@@ -151,7 +153,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
+%{_desktopdir}/flash-player-properties.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
 %endif