Author: glen Date: Thu Jul 7 21:49:44 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- consistent filenames regardless of arch
---- Files affected:
packages/adobe-flash:
adobe-flash.spec (1.156 -> 1.157)
---- Diffs:
================================================================
Index: packages/adobe-flash/adobe-flash.spec
diff -u packages/adobe-flash/adobe-flash.spec:1.156
packages/adobe-flash/adobe-flash.spec:1.157
--- packages/adobe-flash/adobe-flash.spec:1.156 Thu Jul 7 23:41:18 2011
+++ packages/adobe-flash/adobe-flash.spec Thu Jul 7 23:49:39 2011
@@ -3,12 +3,15 @@
# Conditional build:
%bcond_with license_agreement # generates package
+%define ver32 10.3.181.34
+%define ver64 10.3.162.29
+
%ifarch %{ix86}
-%define ver 10.3.181.34
+%define version %{ver32}
%define libmark %{nil}
%endif
%ifarch %{x8664}
-%define ver 10.3.162.29
+%define version %{ver64}
%define libmark ()(64bit)
%endif
@@ -21,18 +24,18 @@
%else
Name: %{base_name}-installer
%endif
-Version: %{ver}
+Version: %{version}
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/flashplayer10-3/flashplayer10-3_rc1_lin_042011.tar.gz
-Source0:
http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz#/%{name}-%{version}.tgz
+Source0:
http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz#/%{name}-%{ver32}.tgz
# NoSource0-md5: 26770108412158b710e633b06a71ca25
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
+Source1:
http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz#/%{name}64-%{ver64}.tgz
# NoSource1-md5: 49b55c7eb8044453e5f6f2e4b3cb4084
NoSource: 1
Source2: mms.cfg
@@ -160,6 +163,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.157 2011/07/07 21:49:39 glen
+- consistent filenames regardless of arch
+
Revision 1.156 2011/07/07 21:41:18 glen
- use versioned url
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adobe-flash/adobe-flash.spec?r1=1.156&r2=1.157&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
