[nspluginwrapper/f18] Fixed bug #841798 - don't wrap plugins with the same arch

[Martin Stransky]

commit 4429cea3ad459227716cced6bf0603b102cb173e
Author: Martin Stransky <stransky at redhat.com>
Date:   Mon Aug 13 16:23:31 2012 +0200

    Fixed bug #841798 - don't wrap plugins with the same arch

 nspluginwrapper.spec           |    9 ++++++---
 plugin-config-native.patch     |   11 -----------
 plugin-config-non-native.patch |   16 ++++++++++++++++
 3 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/nspluginwrapper.spec b/nspluginwrapper.spec
index a99b274..30b1022 100644
--- a/nspluginwrapper.spec
+++ b/nspluginwrapper.spec
@@ -83,7 +83,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.4.4
-Release:	10%{?dist}
+Release:	11%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -104,7 +104,7 @@ Patch12:	nspluginwrapper-1.4.4-restart.patch
 Patch100:	plugin-config-setuid.patch
 Patch101:	plugin-config-umask.patch
 Patch102:	plugin-config-print.patch
-Patch103:	plugin-config-native.patch
+Patch103:	plugin-config-non-native.patch
 Patch104:	plugin-config-time-check.patch
 
 Provides:	%{name} = %{version}-%{release}
@@ -144,7 +144,7 @@ pushd %plugin_config_name
 %patch100 -p2
 %patch101 -p2 -b .umask
 %patch102 -p2 -b .print
-%patch103 -p2 -b .native
+%patch103 -p2 -b .non-native
 %patch104 -p2 -b .time
 popd
 
@@ -263,6 +263,9 @@ fi;
 
 
 %changelog
+* Mon Aug 13 2012 Martin Stransky <stransky at redhat.com> 1.4.4-11
+- Fixed bug #841798 - don't wrap plugins with the same arch
+
 * Wed Jul 18 2012 Martin Stransky <stransky at redhat.com> 1.4.4-10
 - Restart workaround for Adobe Reader plugin (rhbz#645599)
 
diff --git a/plugin-config-non-native.patch b/plugin-config-non-native.patch
new file mode 100644
index 0000000..24b9ea5
--- /dev/null
+++ b/plugin-config-non-native.patch
@@ -0,0 +1,16 @@
+diff -up nspluginwrapper-1.4.4/plugin-config-1.9/src/plugin-config.c.non-native nspluginwrapper-1.4.4/plugin-config-1.9/src/plugin-config.c
+--- nspluginwrapper-1.4.4/plugin-config-1.9/src/plugin-config.c.non-native	2012-08-13 15:33:19.000000000 +0200
++++ nspluginwrapper-1.4.4/plugin-config-1.9/src/plugin-config.c	2012-08-13 15:37:02.660811240 +0200
+@@ -373,12 +373,6 @@ int get_wrap_config(WRAP_PLUGIN *p_plugi
+ {
+   int wrap = FALSE;
+ 
+-  if(p_plugin->t_bits == BITS_32 && p_plugin->s_bits == p_plugin->t_bits) {
+-    wrap = cfg.wrapper_32b;
+-  }
+-  if(p_plugin->t_bits == BITS_64 && p_plugin->s_bits == p_plugin->t_bits) {
+-    wrap = cfg.wrapper_64b;
+-  }
+   if(p_plugin->t_bits == BITS_64 && p_plugin->s_bits == BITS_32) {
+     wrap = cfg.wrapper_64b && cfg.wrapper_32b;
+   }