patch location of pld flash plugin

diff --git a/opera.spec b/opera.spec
index 8d7f4279a346c5638d39eb74355e88909143cee9..b31f68893bb02b28f38e78acce018a171f40ed13 100644 (file)
--- a/opera.spec
+++ b/opera.spec
@@ -14,7 +14,7 @@ Summary(hu.UTF-8):    A világ leggyorsabb webböngészője
 Summary(pl.UTF-8):     Najszybsza przeglądarka WWW na świecie
 Name:          opera
 Version:       31.0.1889.174
 Summary(pl.UTF-8):     Najszybsza przeglądarka WWW na świecie
 Name:          opera
 Version:       31.0.1889.174

-Release:       0.6
+Release:       0.7

 Epoch:         2
 License:       Distributable
 Group:         X11/Applications/Networking
 Epoch:         2
 License:       Distributable
 Group:         X11/Applications/Networking


@@ -23,6 +23,7 @@ Source10:     ftp://ftp.opera.com/pub/opera/desktop/%{version}/linux/%{name}-stable_
 Source0:       %{name}.desktop
 Source1:       %{name}.sh
 Patch1:                %{name}-desktop.patch
 Source0:       %{name}.desktop
 Source1:       %{name}.sh
 Patch1:                %{name}-desktop.patch

+Patch2:                pepper_flash_config.patch

 URL:           http://www.opera.com/
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.356
 URL:           http://www.opera.com/
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.356


@@ -75,6 +76,7 @@ mv usr/share/applications/%{name}.desktop .
 mv usr/share/doc/opera-stable/* .
 
 %patch1 -p1
 mv usr/share/doc/opera-stable/* .
 
 %patch1 -p1

+%patch2 -p1

 
 sed -e 's#/usr/lib/opera#%{_libdir}/opera#g' %{_sourcedir}/%{name}.sh > %{name}.sh
 
 
 sed -e 's#/usr/lib/opera#%{_libdir}/opera#g' %{_sourcedir}/%{name}.sh > %{name}.sh
 

diff --git a/pepper_flash_config.patch b/pepper_flash_config.patch
new file mode 100644 (file)
index 0000000..9b9ee53
--- /dev/null
+++ b/pepper_flash_config.patch
@@ -0,0 +1,15 @@
+--- opera-31.0.1889.174/resources/pepper_flash_config.json~    2015-08-17 16:34:34.000000000 +0300
++++ opera-31.0.1889.174/resources/pepper_flash_config.json     2015-09-06 11:21:10.636750476 +0300
+@@ -3,10 +3,12 @@
+     "/opt/google/chrome-beta/PepperFlash/libpepflashplayer.so",
+     "/opt/google/chrome-unstable/PepperFlash/libpepflashplayer.so",
+     "/opt/google/chrome/PepperFlash/libpepflashplayer.so",
++    "/usr/lib/browser-plugins/PepperFlash/libpepflashplayer.so",
+     "/usr/lib/PepperFlash/libpepflashplayer.so",
+     "/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so",
+     "/usr/lib/chromium/PepperFlash/libpepflashplayer.so",
+     "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so",
++    "/usr/lib64/browser-plugins/PepperFlash/libpepflashplayer.so",
+     "/usr/lib64/PepperFlash/libpepflashplayer.so",
+     "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so",
+     "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so"