[nspluginwrapper/f16] Merge with master

[Martin Stransky]

commit d57795656839018b897abaf2cb2fba4644466ba9
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Feb 6 13:15:14 2012 +0100

    Merge with master

 nspluginwrapper-pthread.patch |   27 +++++++++++++++++++++++++++
 nspluginwrapper.spec          |   18 ++++++++++++++++--
 2 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/nspluginwrapper-pthread.patch b/nspluginwrapper-pthread.patch
new file mode 100644
index 0000000..a44aaaf
--- /dev/null
+++ b/nspluginwrapper-pthread.patch
@@ -0,0 +1,27 @@
+diff -up nspluginwrapper-1.4.4/Makefile.pthread nspluginwrapper-1.4.4/Makefile
+--- nspluginwrapper-1.4.4/Makefile.pthread	2011-10-27 17:11:08.048040662 +0200
++++ nspluginwrapper-1.4.4/Makefile	2011-10-27 17:11:08.057040729 +0200
+@@ -37,7 +37,7 @@ ifneq (,$(findstring $(OS),linux))
+ libdl_LIBS = -ldl
+ endif
+ 
+-libpthread_LIBS = -lpthread
++libpthread_LIBS = -lgthread
+ ifeq ($(OS),dragonfly)
+ libpthread_LDFLAGS = -pthread
+ endif
+diff -up nspluginwrapper-1.4.4/src/npw-player.c.pthread nspluginwrapper-1.4.4/src/npw-player.c
+--- nspluginwrapper-1.4.4/src/npw-player.c.pthread	2011-07-01 05:18:57.000000000 +0200
++++ nspluginwrapper-1.4.4/src/npw-player.c	2011-10-27 17:45:55.963760487 +0200
+@@ -25,10 +25,10 @@
+ #include <unistd.h>
+ #include <glib.h>
+ #include <glib/gstdio.h>
+-#include <glib/gthread.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
+ #include <gdk/gdkkeysyms.h>
++#include <pthread.h>
+ 
+ #include "rpc.h"
+ #include "utils.h"
diff --git a/nspluginwrapper.spec b/nspluginwrapper.spec
index 8e34018..d16afa9 100644
--- a/nspluginwrapper.spec
+++ b/nspluginwrapper.spec
@@ -75,7 +75,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.4.4
-Release:	4%{?dist}
+Release:	7%{?dist}
 Source0:	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/%{name}-%{version}%{?svndate:-%{svndate}}.tar.gz
 Source1:	%{plugin_config_name}.tar.gz
 Source2:	plugin-config.sh.in
@@ -85,6 +85,7 @@ Patch3:		nspluginwrapper-1.3.0-directory.patch
 Patch6:		nspluginwrapper-1.3.0-compiz.patch
 Patch7:		nspluginwrapper-1.3.0-comp.patch
 Patch9:		nspluginwrapper-1.3.0-timeout.patch
+Patch10:	nspluginwrapper-pthread.patch
 Patch100:	plugin-config-setuid.patch
 Patch101:	plugin-config-umask.patch
 Patch102:	plugin-config-print.patch
@@ -121,6 +122,9 @@ This package consists in:
 %patch6 -p1 -b .compiz
 %patch7 -p1 -b .comp
 %patch9 -p1 -b .timeout
+%if 0%{?fedora} > 16
+%patch10 -p1 -b .pthread
+%endif
 
 # Plugin-config patches
 pushd %plugin_config_name
@@ -243,10 +247,20 @@ fi;
 %{pkgdir}/nspluginplayer
 %{plugindir}/npwrapper.so
 %{_bindir}/mozilla-plugin-config
-%config %{_sysconfdir}/sysconfig/%{name}
+%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 
 
 %changelog
+* Mon Feb 6 2012 Martin Stransky <stransky at redhat.com> 1.4.4-7
+- marked /etc/sysconfig/nspluginwrapper as "noreplace" 
+  config file (rhbz#787317)
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Oct 27 2011 Martin Stransky <stransky at redhat.com> 1.4.4-5
+- Rawhide build fix (pthread)
+
 * Thu Oct 27 2011 Martin Stransky <stransky at redhat.com> 1.4.4-4
 - Updated package description (#734056)