packages: adobe-flash/adobe-flash.spec - 32bit up to 10.2.152.27 - use simp...

[glen]

Author: glen                         Date: Tue Feb  8 20:19:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 32bit up to 10.2.152.27
- use simple version macro

---- Files affected:
packages/adobe-flash:
   adobe-flash.spec (1.145 -> 1.146) 

---- Diffs:

================================================================
Index: packages/adobe-flash/adobe-flash.spec
diff -u packages/adobe-flash/adobe-flash.spec:1.145 packages/adobe-flash/adobe-flash.spec:1.146
--- packages/adobe-flash/adobe-flash.spec:1.145	Mon Dec  6 14:32:17 2010
+++ packages/adobe-flash/adobe-flash.spec	Tue Feb  8 21:19:39 2011
@@ -3,18 +3,13 @@
 # Conditional build:
 %bcond_with	license_agreement	# generates package
 
+%ifarch %{ix86}
+%define		ver		10.2.152.27
+%define		libmark	%{nil}
+%endif
 %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	151
-%define		ver_serial	49
-%define		libmark		%{nil}
+%define		ver		10.3.162.29
+%define		libmark	()(64bit)
 %endif
 
 %define		base_name	adobe-flash
@@ -26,15 +21,16 @@
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	%{ver_major}.%{ver_minor}.%{ver_patch}.%{ver_serial}
+Version:	%{ver}
 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_10_linux.tar.gz
-Source0:	http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_111710.tar.gz
-# NoSource0-md5:	3a5c1e0a77bb44d3456c933a056bcf47
+#Source0:	http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p2_32bit_linux_111710.tar.gz
+#Source0:	http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-%{version}-release.i386.rpm
+Source0:	http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz
+# NoSource0-md5:	e9fc57403796a4992474e4f25857ca14
 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
@@ -91,7 +87,7 @@
 %endif
 
 %build
-s='LNX %{ver_major},%{ver_minor},%{ver_patch},%{ver_serial}'
+s=$(echo 'LNX %{version}' | tr . ,)
 v=$(strings libflashplayer.so | grep '^LNX ')
 if [ "$v" != "$s" ]; then
 	: wrong version
@@ -161,6 +157,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2011/02/08 20:19:39  glen
+- 32bit up to 10.2.152.27
+- use simple version macro
+
 Revision 1.145  2010/12/06 13:32:17  glen
 - md5 fix
 
================================================================

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