- updated to 10.0.15.3, x86_64 version updated to 10.0.7.d21.1

[packages/adobe-flash.git] / adobe-flash.spec

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 53b34eea7a9d9514b12640e7a526471c841b9d91..7a103b22f4708b980876c754f7c13a9ab65a5437 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -2,10 +2,19 @@
 # Conditional build:
 %bcond_with    license_agreement       # generates package
 #
+%ifarch %{x8664}
+%define         ver_major       10
+%define         ver_minor       0
+%define         ver_patch       d21
+%define         ver_serial      1
+%define                libmark         ()(64bit)
+%else
 %define                ver_major       10
 %define                ver_minor       0
-%define                ver_patch       12
-%define                ver_serial      36
+%define                ver_patch       15
+%define                ver_serial      3
+%define                libmark         %{nil}
+%endif
 %define                base_name       adobe-flash
 %define                rel 1
 Summary:       Flash plugin for Netscape-compatible WWW browsers
@@ -21,19 +30,20 @@ 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:       4777665a6149af11233d8a000b89ffb1
+# NoSource0-md5:       afab0b40b0ae11445e2e90a4a9224a8a
+Source1:       http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.d21.1.linux-x86_64.so.tar.gz
+# NoSource1-md5:       c165af9d4e324bfaf6d1cfbdbe959fbb
 %else
-Source1:       license-installer.sh
+Source2:       license-installer.sh
 %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
-Requires:      libcurl.so.4
-Requires:      libnss3.so
+# dlopened by player
+Requires:      libasound.so.2%{libmark}
+Requires:      libcurl.so.4%{libmark}
 %else
 Requires:      rpm-build-tools
 %endif
@@ -44,7 +54,7 @@ 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
@@ -65,7 +75,11 @@ 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 -b 0 -n install_flash_player_%{ver_major}_linux
+%endif
 %endif
 
 %install
@@ -79,7 +93,7 @@ sed -e '
        s-@VERSION@-%{version}-g
        s-@RELEASE@-%{release}-g
        s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
-' %{SOURCE1} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
@@ -94,10 +108,6 @@ AutoUpdateInterval=0
 # OverrideGPUValidation=true
 EOF
 install *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
-
-# HACK: Try if new ABI is compatible
-sed -i -e 's/libcurl\.so\.3/libcurl.so.4/g' $RPM_BUILD_ROOT%{_browserpluginsdir}/libflashplayer.so
-
 %endif
 
 %clean