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

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 5579290..e921d65 100644
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,12 +1,23 @@
 #
 # Conditional build:
 %bcond_with	license_agreement	# generates package
-#
-%define		_ver_major	9
-%define		_ver_minor	0
-%define		_ver_patch	48
-%define		_ver_serial	0
+
+%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 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}
@@ -14,41 +25,56 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-%define		_rel 1
-Version:	%{_ver_major}.%{_ver_minor}.%{_ver_patch}.%{_ver_serial}
-Release:	%{_rel}%{?with_license_agreement:wla}
+Version:	%{ver_major}.%{ver_minor}.%{ver_patch}.%{ver_serial}
+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_9_linux.tar.gz
-# NoSource0-md5:	821cc72359a937caef85bb4cc74ef5cd
+##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
-Source0:	license-installer.sh
-# NoSource0-md5:	821cc72359a937caef85bb4cc74ef5cd
+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}
 BuildRequires:	rpmbuild(macros) >= 1.357
+BuildRequires:	sed >= 4.0
 Requires:	browser-plugins >= 2.0
-# apparently dlopened by player
-Requires:	libasound.so.2
+# dlopened by player
+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:	macromedia-flash
 Provides:	browser(flash)
+Provides:	macromedia-flash
 Obsoletes:	flash-plugin
 Obsoletes:	konqueror-plugin-macromedia-flash
 Obsoletes:	macromedia-flash
 Obsoletes:	mozilla-firefox-plugin-macromedia-flash
 Obsoletes:	mozilla-plugin-macromedia-flash
-ExclusiveArch:	%{ix86}
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sysconfdir	/etc/adobe
 
+# So that building package on AC system won't write package name dep that Th system can't understand (libstdc++4)
+%define		_noautoreqdep	libstdc++.so.6
+
+# No debuginfo to be stored
+%define		_enable_debug_packages	0
+
 %description
-Adobe(R) Flash(R) Player 9 for Linux - the next-generation client
+Adobe(R) Flash(R) Player for Linux - the next-generation client
 runtime for engaging with Flash content and applications on Linux.
 
 %description -l pl.UTF-8
@@ -57,7 +83,19 @@ treści i aplikacji we Flashu pod Linuksem.
 
 %prep
 %if %{with license_agreement}
-%setup -q -n install_flash_player_%{_ver_major}_linux
+%ifarch %{x8664}
+%setup -q -T -c -b 1
+%else
+%setup -q -T -c -b 0
+%endif
+
+%build
+s='LNX %{ver_major},%{ver_minor},%{ver_patch},%{ver_serial}'
+v=$(strings libflashplayer.so | grep '^LNX ')
+if [ "$v" != "$s" ]; then
+	: wrong version
+	exit 1
+fi
 %endif
 
 %install
@@ -71,7 +109,8 @@ sed -e '
 	s-@VERSION@-%{version}-g
 	s-@RELEASE@-%{release}-g
 	s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
-' %{SOURCE0} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+	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}
 
@@ -80,11 +119,12 @@ install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 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}
-
 %endif
 
 %clean