packages: adobe-flash/adobe-flash.spec - simplify

[glen]

Author: glen                         Date: Fri Jul 31 11:20:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify

---- Files affected:
packages/adobe-flash:
   adobe-flash.spec (1.120 -> 1.121) 

---- Diffs:

================================================================
Index: packages/adobe-flash/adobe-flash.spec
diff -u packages/adobe-flash/adobe-flash.spec:1.120 packages/adobe-flash/adobe-flash.spec:1.121
--- packages/adobe-flash/adobe-flash.spec:1.120	Fri Jul 31 09:40:30 2009
+++ packages/adobe-flash/adobe-flash.spec	Fri Jul 31 13:20:06 2009
@@ -2,20 +2,18 @@
 #
 # Conditional build:
 %bcond_with	license_agreement	# generates package
-#
-%ifarch %{x8664}
-%define         ver_major       10
-%define         ver_minor       0
-%define         ver_patch       32
-%define         ver_serial      18
-%define		libmark		()(64bit)
-%else
+
 %define		ver_major	10
 %define		ver_minor	0
 %define		ver_patch	32
 %define		ver_serial	18
+
+%ifarch %{x8664}
+%define		libmark		()(64bit)
+%else
 %define		libmark		%{nil}
 %endif
+
 %define		base_name	adobe-flash
 %define		rel 1
 Summary:	Flash plugin for Netscape-compatible WWW browsers
@@ -33,7 +31,7 @@
 %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-10.0.32.18.linux-x86_64.so.tar.gz
+Source1:	http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-%{version}.linux-x86_64.so.tar.gz
 # NoSource1-md5:	332e60275e9c7a92059f286a2bad6e41
 %else
 Source2:	license-installer.sh
@@ -145,6 +143,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.121  2009/07/31 11:20:06  glen
+- simplify
+
 Revision 1.120  2009/07/31 07:40:30  arekm
 - up to 10.0.32.18
 
@@ -156,7 +157,7 @@
 
 Revision 1.117  2009/04/29 11:44:48  gotar
 - upgraded ix86 to 10.0.22.87
-  [ 10.0.22.87 fixes CVE-2009-0519, CVE-2009-0520, CVE-2009-0522, 
+  [ 10.0.22.87 fixes CVE-2009-0519, CVE-2009-0520, CVE-2009-0522,
     CVE-2009-0114, CVE-2009-0521 ]
 
 Revision 1.116  2009/03/07 20:09:25  djurban
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adobe-flash/adobe-flash.spec?r1=1.120&r2=1.121&f=u