- up to 11.2.202.251

[packages/adobe-flash.git] / adobe-flash.spec

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 6a7734cf57d125d8457e6e948d6b45cd07df0987..e4ac90ebd80dc53c069a48cef0be8dc44924ccc4 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -1,9 +1,11 @@
 #
+# TODO: package kde4 component
+#
 # Conditional build:
 %bcond_with    license_agreement       # generates package
 
-%define                ver32   11.0.1.98
-%define                ver64   11.0.1.98
+%define                ver32   11.2.202.251
+%define                ver64   11.2.202.251
 
 %ifarch %{ix86}
 %define                version %{ver32}
@@ -29,25 +31,24 @@ 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://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer11_b2_install_lin_32_080811.tar.gz#/%{base_name}-%{ver32}.tgz
-# NoSource0-md5:       285d585fd6bbf6bdaf16d404dceaa761
+Source0:       http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver32}/install_flash_player_11_linux_i386.tar.gz#/flash-%{version}.tgz
+# NoSourceSource0-md5: c0eeddf06807c6606b99739c1c21c74f
 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/flashplatformruntimes/flashplayer11/flashplayer11_b2_install_lin_64_080811.tar.gz#/%{base_name}64-%{ver64}.tgz
-# NoSource1-md5:       87ccb674fbcf94739f82cc6089634623
+Source1:       http://fpdownload.macromedia.com/get/flashplayer/pdc/%{ver64}/install_flash_player_11_linux_x86_64.tar.gz#/flash64-%{version}.tgz
+# NoSourceSource1-md5: d9a925117f643f2678a2609d25734b15
 NoSource:      1
-Source2:       mms.cfg
 %else
 Source3:       http://svn.pld-linux.org/svn/license-installer/license-installer.sh
-# Source3-md5: 329c25f457fea66ec502b7ef70cb9ede
+# Source3-md5: 39dd73d36280769d0f74d642c7b0c6d3
 %endif
-Source4:       memcpy-to-memmove.sh
+Source2:       mms.cfg
 URL:           http://www.adobe.com/products/flashplayer/
+Patch0:                desktop.patch
 %if %{with license_agreement}
 BuildRequires: rpmbuild(macros) >= 1.357
 BuildRequires: sed >= 4.0
 Requires:      browser-plugins >= 2.0
+Requires:      hicolor-icon-theme
 # dlopened by player
 Requires:      libasound.so.2%{libmark}
 Requires:      libcurl.so.4%{libmark}
@@ -88,6 +89,7 @@ treści i aplikacji we Flashu pod Linuksem.
 %else
 %setup -q -T -c -b 0
 %endif
+%patch0 -p1
 
 %build
 s=$(echo 'LNX %{version}' | tr . ,)
@@ -96,14 +98,6 @@ if [ "$v" != "$s" ]; then
        : wrong version
        exit 1
 fi
-
-%ifarch %{x8664}
-# Bug #354073: Patch binary to use memmove instead of memcpy from
-# Redhat's bug https://bugzilla.redhat.com/show_bug.cgi?id=638477#c94
-cp libflashplayer.so libflashplayer.so.orig
-/bin/bash %{SOURCE4} libflashplayer.so \
-|| (echo "memcpy-to-memmove.sh failed" && exit 1)
-%endif
 %endif
 
 %install
@@ -118,17 +112,21 @@ sed -e '
        s-@RELEASE@-%{release}-g
        s,@SPECFILE@,%{_datadir}/%{base_name}/%{base_name}.spec,g
        s,@DATADIR@,%{_datadir}/%{base_name},g
+       s,@COPYSOURCES@,mms.cfg desktop.patch,g
 ' %{SOURCE3} > $RPM_BUILD_ROOT%{_bindir}/%{base_name}.install
 
 cp -p %{_specdir}/%{base_name}.spec $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
+install %{PATCH0} $RPM_BUILD_ROOT%{_datadir}/%{base_name}
 
 %else
 
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_browserpluginsdir},%{_bindir},%{_desktopdir}}
+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
@@ -140,11 +138,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
@@ -158,4 +158,5 @@ fi
 %attr(755,root,root) %{_bindir}/flash-player-properties
 %attr(755,root,root) %{_browserpluginsdir}/*.so
 %{_desktopdir}/flash-player-properties.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
 %endif