X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adobe-flash.spec;h=be40c8ad965c79a390fcdc0b2ed531968f0c02dd;hb=0c2e1fe2f68a690b07a089f41a91c3f910bab8ed;hp=a967b26af3454dbd6b1ff34724c311575bc59560;hpb=b2076d72a7cb9430ba65743df16646caf2701891;p=packages%2Fadobe-flash.git

diff --git a/adobe-flash.spec b/adobe-flash.spec
index a967b26..be40c8a 100644
--- 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.183
-%define		ver64	11.2.202.183
-
 %ifarch %{ix86}
-%define		version	%{ver32}
 %define		libmark	%{nil}
 %endif
 %ifarch %{x8664}
-%define		version	%{ver64}
 %define		libmark	()(64bit)
 %endif
 
@@ -25,17 +21,17 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	%{version}
+Version:	11.2.202.635
 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/flashplayer11-2/flashplayer11-2_p4_install_lin_32_011912.tar.gz
-# NoSourceSource0-md5:	7ba6da7b0525c48819d2a06c7f3eab05
+Source0:	http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/install_flash_player_11_linux.i386.tar.gz?/flash-%{version}.i386.tar.gz
+# NoSource0-md5:	757d0835a038a1358d2e33ce7fb6c9eb
 NoSource:	0
-Source1:	http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11-2/flashplayer11-2_p4_install_lin_64_011912.tar.gz
-# NoSourceSource1-md5:	1fa02e0c8313082a63ce1e17d3386190
+Source1:	http://fpdownload.macromedia.com/get/flashplayer/pdc/%{version}/install_flash_player_11_linux.x86_64.tar.gz?/flash-%{version}.x86_64.tar.gz
+# NoSource1-md5:	5bb834820d1563b2df2ed52fd9986b24
 NoSource:	1
 %else
 Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
@@ -43,18 +39,20 @@ Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
 %endif
 Source2:	mms.cfg
 URL:		http://www.adobe.com/products/flashplayer/
+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}
-Requires:	hicolor-icon-theme
 %else
 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,6 +86,7 @@ treści i aplikacji we Flashu pod Linuksem.
 %else
 %setup -q -T -c -b 0
 %endif
+%patch0 -p1
 
 %build
 s=$(echo 'LNX %{version}' | tr . ,)
@@ -110,18 +109,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},%{_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
-#cp -a usr/share/icons/* $RPM_BUILD_ROOT%{_iconsdir}
+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
@@ -148,10 +150,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) %{_bindir}/flash-player-properties
 %attr(755,root,root) %{_browserpluginsdir}/*.so
-#%{_desktopdir}/flash-player-properties.desktop
-#%{_iconsdir}/hicolor/*/apps/*.png
+%{_desktopdir}/flash-player-properties.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
 %endif