X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adobe-flash.spec;h=e921d650850c2804f0373aaae298b7591d285863;hb=cd4b2b609e5cd1612fbb73eaea44e4fb789c91f7;hp=61cb0ee85179766352536fc5eb018721fbec0305;hpb=f4a110d999cd1eee977f1dc5a8541abd146f25e0;p=packages%2Fadobe-flash.git

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 61cb0ee..7efae8e 100644
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,19 +1,15 @@
+# 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
 
+%ifarch %{ix86}
+%define		libmark	%{nil}
+%endif
 %ifarch %{x8664}
-%define		ver_major	10
-%define		ver_minor	2
-%define		ver_patch	161
-%define		ver_serial	23
-%define		libmark		()(64bit)
-%else
-%define		ver_major	10
-%define		ver_minor	2
-%define		ver_patch	161
-%define		ver_serial	23
-%define		libmark		%{nil}
+%define		libmark	()(64bit)
 %endif
 
 %define		base_name	adobe-flash
@@ -25,29 +21,33 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	%{ver_major}.%{ver_minor}.%{ver_patch}.%{ver_serial}
+Version:	25.0.0.130
 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/current/install_flash_player_10_linux.tar.gz
-Source0:	http://download.macromedia.com/pub/labs/flashplayer10/flashplayer_square_p2_32bit_linux_092710.tar.gz
-# NoSource0-md5:	b3cc7671ce5e62a687e7a22555f08611
+#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:	becbcfe163c1dba21a03e73427cd3f62
 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/flashplayer10/flashplayer_square_p2_64bit_linux_092710.tar.gz
-# NoSource1-md5:	a735a3c581337ed2a06a20714846645e
+#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:	9b66f1a27244e0e2110b1e5c3c8aaafb
 NoSource:	1
 %else
-Source2:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
-# Source2-md5:	329c25f457fea66ec502b7ef70cb9ede
+Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source3-md5:	329c25f457fea66ec502b7ef70cb9ede
 %endif
-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,10 +89,11 @@ treści i aplikacji we Flashu pod Linuksem.
 %else
 %setup -q -T -c -b 0
 %endif
+%patch0 -p1
 
 %build
-s='LNX %{ver_major},%{ver_minor},%{ver_patch},%{ver_serial}'
-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
@@ -110,21 +112,21 @@ sed -e '
 	s-@RELEASE@-%{release}-g
 	s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
 	s,@DATADIR@,%{_datadir}/%{base_name},g
-' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+	s,@COPYSOURCES@,mms.cfg desktop.patch,g
+' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
-install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+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}}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
-# http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=16701594
-# http://www.adobe.com/devnet/flashplayer/articles/flash_player_admin_guide.html
-AutoUpdateDisable=1
-AutoUpdateInterval=0
-# OverrideGPUValidation=true
-EOF
-install *.so $RPM_BUILD_ROOT%{_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
@@ -136,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
@@ -149,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