X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adobe-flash.spec;h=e921d650850c2804f0373aaae298b7591d285863;hb=aa56ec7ed2992c1cc64b1574ea79a755c9ae2a58;hp=c057a9ddbd1e9bb4fc1e901501958cfa8acaebdf;hpb=39344dbd887ddae08166f2000e96199a1e203af3;p=packages%2Fadobe-flash.git

diff --git a/adobe-flash.spec b/adobe-flash.spec
index c057a9d..e921d65 100644
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -2,19 +2,22 @@
 # Conditional build:
 %bcond_with	license_agreement	# generates package
 
-%define		ver_major	10
-%define		ver_minor	0
-%define		ver_patch	32
-%define		ver_serial	18
-
 %ifarch %{x8664}
+%define		ver_major	10
+%define		ver_minor	3
+%define		ver_patch	162
+%define		ver_serial	29
 %define		libmark		()(64bit)
 %else
+%define		ver_major	10
+%define		ver_minor	2
+%define		ver_patch	161
+%define		ver_serial	23
 %define		libmark		%{nil}
 %endif
 
 %define		base_name	adobe-flash
-%define		rel 2
+%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}
@@ -28,12 +31,17 @@ 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
-# NoSource0-md5:	6306980e40a3266b4b6c173bfcfdc946
-Source1:	http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-%{version}.linux-x86_64.so.tar.gz
-# NoSource1-md5:	332e60275e9c7a92059f286a2bad6e41
+##Source0:	http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz
+Source0:	http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_111710.tar.gz
+# NoSource0-md5:	3a5c1e0a77bb44d3456c933a056bcf47
+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/flashplayer10_2_p3_64bit_linux_111710.tar.gz
+# NoSource1-md5:	49b55c7eb8044453e5f6f2e4b3cb4084
+NoSource:	1
 %else
-Source2:	license-installer.sh
+Source2:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source2-md5:	329c25f457fea66ec502b7ef70cb9ede
 %endif
 URL:		http://www.adobe.com/products/flashplayer/
 %if %{with license_agreement}
@@ -44,7 +52,8 @@ Requires:	browser-plugins >= 2.0
 Requires:	libasound.so.2%{libmark}
 Requires:	libcurl.so.4%{libmark}
 %else
-Requires:	rpm-build-tools
+Requires:	rpm-build-tools >= 4.4.37
+Requires:	rpmbuild(macros) >= 1.544
 %endif
 Provides:	browser(flash)
 Provides:	macromedia-flash
@@ -82,7 +91,7 @@ treści i aplikacji we Flashu pod Linuksem.
 
 %build
 s='LNX %{ver_major},%{ver_minor},%{ver_patch},%{ver_serial}'
-v=$(strings libflashplayer.so | grep "$s")
+v=$(strings libflashplayer.so | grep '^LNX ')
 if [ "$v" != "$s" ]; then
 	: wrong version
 	exit 1
@@ -100,6 +109,7 @@ sed -e '
 	s-@VERSION@-%{version}-g
 	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
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}