updated nspluginwrapper-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2286 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nspluginwrapper/nspluginwrapper-vl.spec

@@ -11,7 +11,7 @@
 %define plugin_config_binary plugin-config
 
 # Excluded plugins (separated by ':')
-%define exclude_list 		"libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*:librhythmbox*"
+%define exclude_list 		"libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*:librhythmbox*:packagekit*"
 
 # Target defines
 %if "%{_target_cpu}" == "i386"
@@ -75,7 +75,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.3.0
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
@@ -83,10 +83,17 @@ Source3:        %{name}.sh.in
 Patch1:         nspluginwrapper-1.3.0-make.patch
 Patch2:         nspluginwrapper-1.3.0-configure.patch
 Patch3:         nspluginwrapper-1.3.0-directory.patch
+Patch4:		nspluginwrapper-20090625-fix-npident-array-sending.patch
+Patch5:		nspluginwrapper-1.3.0-inst.patch
+Patch6:		nspluginwrapper-1.3.0-compiz.patch
+Patch7:		nspluginwrapper-1.3.0-comp.patch
+Patch8:		nspluginwrapper-1.3.0-silent.patch
+Patch9:		nspluginwrapper-1.3.0-timeout.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
 Patch103:       plugin-config-native.patch
+Patch104:	plugin-config-time-check.patch
 
 License:	GPLv2+
 Group:		Applications/Internet
@@ -136,6 +143,12 @@ This package consists in:
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .dir
+%patch4 -p0 -b .array
+%patch5 -p1 -b .inst
+%patch6 -p1 -b .compiz
+%patch7 -p1 -b .comp
+%patch8 -p1 -b .silent
+%patch9 -p1 -b .timeout
 
 # Plugin-config patches
 pushd %plugin_config_name
@@ -143,6 +156,7 @@ pushd %plugin_config_name
 %patch101 -p2 -b .umask
 %patch102 -p2 -b .print
 %patch103 -p2 -b .native
+%patch104 -p2 -b .time
 popd
 
 %build
@@ -184,37 +198,37 @@ pushd %{build_dir}
 	    --viewer-paths="%{pkgdir32}:%{pkgdir64}"\
 	    --disable-biarch
 	
-make
+%__make
 popd
 
 #Build plugin configuration utility
 pushd %{plugin_config_name}
-./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS"
-make
+./configure --prefix=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
+%__make
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{plugindir}
-mkdir -p $RPM_BUILD_ROOT%{pluginsourcedir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+%__mkdir_p $RPM_BUILD_ROOT%{_bindir}
+%__mkdir_p $RPM_BUILD_ROOT%{plugindir}
+%__mkdir_p $RPM_BUILD_ROOT%{pluginsourcedir}
+%__mkdir_p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
-make -C %{build_dir} install DESTDIR=$RPM_BUILD_ROOT
+%__make -C %{build_dir} install DESTDIR=$RPM_BUILD_ROOT
 
 ln -s %{pkgdir}/npwrapper.so $RPM_BUILD_ROOT/%{plugindir}/npwrapper.so
 
 # Install plugin-config utility
 pushd %{plugin_config_name}
-DESTDIR=$RPM_BUILD_ROOT make install
+DESTDIR=$RPM_BUILD_ROOT %__make install
 popd
 
-cd $RPM_BUILD_ROOT/usr/bin
-mv %{plugin_config_binary} $RPM_BUILD_ROOT/%{pkgdir}
+cd $RPM_BUILD_ROOT%{_bindir}
+%__mv %{plugin_config_binary} $RPM_BUILD_ROOT/%{pkgdir}
 cd -
 
-rm -rf $RPM_BUILD_ROOT/usr/doc/plugin-config
+%__rm -rf $RPM_BUILD_ROOT/usr/doc/plugin-config
 
 cat %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-plugin-config
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/mozilla-plugin-config
@@ -231,17 +245,17 @@ EOF
 chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
 
 # Remove conflicting files
-rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
-rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
+%__rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginplayer
+%__rm -rf $RPM_BUILD_ROOT%{_bindir}/nspluginwrapper
 
 ## <mozilla-filesystem>
-mkdir -p $RPM_BUILD_ROOT/usr/{lib,%{_lib}}/mozilla/{plugins,extensions}
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mozilla/extensions
-mkdir -p $RPM_BUILD_ROOT/etc/skel/.mozilla/{plugins,extensions}
+%__mkdir_p $RPM_BUILD_ROOT/usr/{lib,%{_lib}}/mozilla/{plugins,extensions}
+%__mkdir_p $RPM_BUILD_ROOT/%{_datadir}/mozilla/extensions
+%__mkdir_p $RPM_BUILD_ROOT/etc/skel/.mozilla/{plugins,extensions}
 ## </mozilla-filesystem>
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
 %post
 /usr/bin/mozilla-plugin-config -i -f > /dev/null 2>&1 || :
@@ -300,6 +314,25 @@ fi;
 
 
 %changelog
+* Mon Nov 15 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.0-3
+- applied some improvement patches from Fedora rawhide
+  * Wed Jun 30 2010 Martin Stransky <stransky@redhat.com> 1.3.0-14
+  - fixed patch for rhbz#523273
+  * Tue Jun 29 2010 Martin Stransky <stransky@redhat.com> 1.3.0-13
+  - Changed RPM timeout to 10 second, should prevent 
+    long browser hangs.
+  - Disabled debug outputs in normal build.
+  * Mon Jun 28 2010 Martin Stransky <stransky@redhat.com> 1.3.0-12
+  - Fixed rhbz#523273 - wrapped plugins not getting updated
+  * Fri Dec 4 2009 Martin Stransky <stransky@redhat.com> 1.3.0-10
+  - added Compiz workaround (#542424)
+  * Tue Nov 10 2009 Martin Stransky <stransky@redhat.com> 1.3.0-9
+  - added NULL check (#531669)
+  * Wed Jul 15 2009 Martin Stransky <stransky@redhat.com> 1.3.0-7
+  - NPIdentifiers fix by Tristan Schmelcher (Google)
+  * Wed Jul 15 2009 Martin Stransky <stransky@redhat.com> 1.3.0-6
+  - Package kit plugin is ignored now (#511385)
+
 * Sat Aug 28 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.3.0-2
 - changed Group to System Environment/Libraries