- 64bit flash need to be 'patched' to avoid audio problems with glibc 2.13

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

diff --git a/adobe-flash.spec b/adobe-flash.spec
index 3993af81423c0beed2275b778bb9fb13ccd1ff91..827d16b6a14fc984abb51d023a8f0c382d5eb76f 100644 (file)
--- a/adobe-flash.spec
+++ b/adobe-flash.spec
@@ -35,10 +35,12 @@ NoSource:   0
 Source1:       http://download.macromedia.com/pub/labs/flashplayer10/flashplayer10_2_p3_64bit_linux_111710.tar.gz
 # NoSource1-md5:       49b55c7eb8044453e5f6f2e4b3cb4084
 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
+Source4:       memcpy-to-memmove.sh
 URL:           http://www.adobe.com/products/flashplayer/
 %if %{with license_agreement}
 BuildRequires: rpmbuild(macros) >= 1.357
@@ -92,6 +94,14 @@ 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
@@ -106,21 +116,15 @@ 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}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/mms.cfg
+install -p *.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 %endif
 
 %clean