Author: arekm Date: Mon Nov 17 18:45:52 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- beta version of 64-bit plugin
---- Files affected:
SPECS:
adobe-flash.spec (1.110 -> 1.111)
---- Diffs:
================================================================
Index: SPECS/adobe-flash.spec
diff -u SPECS/adobe-flash.spec:1.110 SPECS/adobe-flash.spec:1.111
--- SPECS/adobe-flash.spec:1.110 Tue Nov 11 20:59:17 2008
+++ SPECS/adobe-flash.spec Mon Nov 17 19:45:47 2008
@@ -3,10 +3,19 @@
# Conditional build:
%bcond_with license_agreement # generates package
#
+%ifarch %{x8664}
%define ver_major 10
%define ver_minor 0
%define ver_patch 12
%define ver_serial 36
+%define libmark (64bit)
+%else
+%define ver_major 10
+%define ver_minor 0
+%define ver_patch d20
+%define ver_serial 7
+%define libmark %{nil}
+%endif
%define base_name adobe-flash
%define rel 1
Summary: Flash plugin for Netscape-compatible WWW browsers
@@ -23,8 +32,11 @@
%if %{with license_agreement}
Source0:
http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz
# NoSource0-md5: 4777665a6149af11233d8a000b89ffb1
+Source1:
http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.d20.7.linux-x86_64.so.tar.gz
+# NoSource1-md5: 14c918ac5a9b9b680bdb37aedae40009
%else
Source1: license-installer.sh
+# Source1-md5: 14c918ac5a9b9b680bdb37aedae40009
%endif
URL: http://www.adobe.com/products/flashplayer/
%if %{with license_agreement}
@@ -32,8 +44,8 @@
BuildRequires: sed >= 4.0
Requires: browser-plugins >= 2.0
# dlopened by player
-Requires: libasound.so.2
-Requires: libcurl.so.4
+Requires: libasound.so.2%{libmark}
+Requires: libcurl.so.4%{libmark}
%else
Requires: rpm-build-tools
%endif
@@ -44,7 +56,7 @@
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 +77,11 @@
%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
@@ -129,6 +145,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.111 2008/11/17 18:45:47 arekm
+- beta version of 64-bit plugin
+
Revision 1.110 2008/11/11 19:59:17 blues
- multiple CVE notes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/adobe-flash.spec?r1=1.110&r2=1.111&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
