X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=adobe-flash.spec;h=fe7a6783bece9bcbd4248a067f5ea56f99e0574e;hb=6df44cc6a2c52dffe08dbee1f073bf066958b447;hp=2c663f814529b49e05e0404c791e98aae93a4079;hpb=1fe695bf52505c90e55921cfb09f5b086d202600;p=packages%2Fadobe-flash.git

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 2c663f8..fe7a678 100644
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,20 +1,23 @@
 #
+# TODO: package kde4 component
+#
 # Conditional build:
 %bcond_with	license_agreement	# generates package
 
-%define		ver_major	10
-%define		ver_minor	0
-%define		ver_patch	45
-%define		ver_serial	2
+%define		ver32	11.2.202.19
+%define		ver64	11.2.202.19
 
+%ifarch %{ix86}
+%define		version	%{ver32}
+%define		libmark	%{nil}
+%endif
 %ifarch %{x8664}
-%define		libmark		()(64bit)
-%else
-%define		libmark		%{nil}
+%define		version	%{ver64}
+%define		libmark	()(64bit)
 %endif
 
 %define		base_name	adobe-flash
-%define		rel 2
+%define		rel 1
 Summary:	Flash plugin for Netscape-compatible WWW browsers
 Summary(pl.UTF-8):	Wtyczka Flash dla przeglądarek WWW zgodnych z Netscape
 %if %{with license_agreement}
@@ -22,19 +25,22 @@ Name:		%{base_name}
 %else
 Name:		%{base_name}-installer
 %endif
-Version:	%{ver_major}.%{ver_minor}.%{ver_patch}.%{ver_serial}
+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://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz
-# NoSource0-md5:	dbfc776cd4310250cde078e0bf0472e7
-Source1:	http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-%{version}.linux-x86_64.so.tar.gz
-# NoSource1-md5:	4a4561e456612a6751653b58342d53df
+Source0:	http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11-2/flashplayer11-2_p1_install_lin_32_102611.tar.gz
+# NoSourceSource0-md5:	4e85ea589dc9ca6fc128380f64e21b70
+NoSource:	0
+Source1:	http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11-2/flashplayer11-2_p1_install_lin_64_102611.tar.gz
+# NoSourceSource1-md5:	0569d9bef0025f3804b026f7a996e082
+NoSource:	1
+Source2:	mms.cfg
 %else
-Source2:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
-# Source2-md5:	329c25f457fea66ec502b7ef70cb9ede
+Source3:	http://svn.pld-linux.org/svn/license-installer/license-installer.sh
+# Source3-md5:	329c25f457fea66ec502b7ef70cb9ede
 %endif
 URL:		http://www.adobe.com/products/flashplayer/
 %if %{with license_agreement}
@@ -44,9 +50,10 @@ Requires:	browser-plugins >= 2.0
 # dlopened by player
 Requires:	libasound.so.2%{libmark}
 Requires:	libcurl.so.4%{libmark}
+Requires:	hicolor-icon-theme
 %else
-Requires:	rpm-build-macros >= 1.544
 Requires:	rpm-build-tools >= 4.4.37
+Requires:	rpmbuild(macros) >= 1.544
 %endif
 Provides:	browser(flash)
 Provides:	macromedia-flash
@@ -83,8 +90,8 @@ treści i aplikacji we Flashu pod Linuksem.
 %endif
 
 %build
-s='LNX %{ver_major},%{ver_minor},%{ver_patch},%{ver_serial}'
-v=$(strings libflashplayer.so | grep "$s")
+s=$(echo 'LNX %{version}' | tr . ,)
+v=$(strings libflashplayer.so | grep '^LNX ')
 if [ "$v" != "$s" ]; then
 	: wrong version
 	exit 1
@@ -103,21 +110,18 @@ sed -e '
 	s-@RELEASE@-%{release}-g
 	s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
 	s,@DATADIR@,%{_datadir}/%{base_name},g
-' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
+' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
-install %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+cp -p %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_browserpluginsdir}}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
-# http://www.adobe.com/cfusion/knowledgebase/index.cfm?id=16701594
-# http://www.adobe.com/devnet/flashplayer/articles/flash_player_admin_guide.html
-AutoUpdateDisable=1
-AutoUpdateInterval=0
-# OverrideGPUValidation=true
-EOF
-install *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_browserpluginsdir},%{_bindir},%{_desktopdir},%{_iconsdir}}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
+install -p *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
+#install usr/bin/flash-player-properties $RPM_BUILD_ROOT%{_bindir}
+#install usr/share/applications/flash-player-properties.desktop $RPM_BUILD_ROOT%{_desktopdir}/flash-player-properties.desktop
+#cp -a usr/share/icons/* $RPM_BUILD_ROOT%{_iconsdir}
 %endif
 
 %clean
@@ -129,11 +133,13 @@ rm -rf $RPM_BUILD_ROOT
 %else
 %post
 %update_browser_plugins
+%update_icon_cache hicolor
 
 %postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
+%update_icon_cache hicolor
 %endif
 
 %files
@@ -144,5 +150,8 @@ fi
 %else
 %dir %{_sysconfdir}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mms.cfg
+#%attr(755,root,root) %{_bindir}/flash-player-properties
 %attr(755,root,root) %{_browserpluginsdir}/*.so
+#%{_desktopdir}/flash-player-properties.desktop
+#%{_iconsdir}/hicolor/*/apps/*.png
 %endif