diff options
| author | Mauricio Teixeira <mteixeir@redhat.com> | 2017-01-13 09:17:06 -0500 |
|---|---|---|
| committer | Mauricio Teixeira <mteixeir@redhat.com> | 2017-01-13 09:17:06 -0500 |
| commit | fee3d94e760c9d577ea9b7617704c9292e83a432 (patch) | |
| tree | fa14eb897506218a97ad564413f0bf8cd6f3028b | |
| parent | 562f1ca87beb43bb1f9159ba1c367995c7c07faf (diff) | |
| download | freshplayerplugin-fee3d94e760c9d577ea9b7617704c9292e83a432.tar.gz freshplayerplugin-fee3d94e760c9d577ea9b7617704c9292e83a432.tar.xz freshplayerplugin-fee3d94e760c9d577ea9b7617704c9292e83a432.zip | |
bz#4411 Add Adobe PPAPI directory to search list (from flash-player-ppapi
| -rw-r--r-- | freshplayerplugin-adobe-ppapi.patch | 11 | ||||
| -rw-r--r-- | freshplayerplugin.spec | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/freshplayerplugin-adobe-ppapi.patch b/freshplayerplugin-adobe-ppapi.patch deleted file mode 100644 index a627517..0000000 --- a/freshplayerplugin-adobe-ppapi.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru freshplayerplugin-0.3.6.orig/src/config_pepperflash.c freshplayerplugin-0.3.6/src/config_pepperflash.c ---- freshplayerplugin-0.3.6.orig/src/config_pepperflash.c 2016-10-04 18:44:50.000000000 -0400 -+++ freshplayerplugin-0.3.6/src/config_pepperflash.c 2017-01-12 17:39:49.534740489 -0500 -@@ -39,6 +39,7 @@ - "/usr/lib64/chromium/PepperFlash", // chromium-pepper-flash (Old Build) (CentOS/Read Hat/Fedora) - "/opt/chromium/PepperFlash", // chromium-pepper-flash (New Build) (CentOS/Read Hat/Fedora) - "/usr/lib/pepflashplugin-installer", // pepflashplugin-installer (Ubuntu) -+ "/usr/lib64/flash-plugin", // flash-player-ppapi (from Adobe repo) - NULL, - }; - diff --git a/freshplayerplugin.spec b/freshplayerplugin.spec index 6b931c7..9cc348f 100644 --- a/freshplayerplugin.spec +++ b/freshplayerplugin.spec @@ -7,8 +7,6 @@ License: MIT URL: https://github.com/i-rinat/freshplayerplugin Source0: https://github.com/i-rinat/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: freshplayerplugin-adobe-ppapi.patch - BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: make @@ -72,7 +70,7 @@ not only Firefox. #sed -i 's|enable_3d = 1|enable_3d = 0|g' data/freshwrapper.conf.example #sed -i 's|enable_3d = 1,|enable_3d = 0,|g' src/config.c -%patch0 -p1 +sed -i 's| NULL,| "/usr/lib64/flash-plugin", // flash-player-ppapi (from Adobe repo)\n NULL,|g' src/config_pepperflash.c %build mkdir build @@ -94,7 +92,7 @@ install -Dm 0644 data/freshwrapper.conf.example %{buildroot}/etc/freshwrapper.co %changelog * Fri Jan 13 2017 Mauricio Teixeira <mauricio.teixeira@gmail.com> - 0.3.6-2 -- bz#4411 Add Adobe PPAPI directory to search list (from flash-player-ppapi) +- bz#4411 Add Adobe PPAPI directory to search list (from flash-player-ppapi * Fri Oct 07 2016 Mauricio Teixeira <mauricio.teixeira@gmail.com> - 0.3.6-1 - Upgrade to 0.3.6 |