updated nspluginwrapper and install-assist-flash-plugin: supported native linux x86_64 flash-plugin

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4870 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*:packagekit*:libnsISpicec*"
+%define exclude_list 	"libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*:librhythmbox*:packagekit*:libnsISpicec*:libgnashplugin*:liblightsparkplugin*:libflashplayer*"
 
 # Target defines
 %if "%{_target_cpu}" == "i386"
@@ -74,23 +74,17 @@
 
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
-Version:	1.3.0
-Release:	4%{?_dist_release}
-Source0:	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
+Version:	1.4.4
+Release:	1%{?_dist_release}
+Source0:	http://nspluginwrapper.org/download/%{name}-%{version}%{?svndate:-%{svndate}}.tar.gz
 Source1:	%{plugin_config_name}.tar.gz
 Source2:	plugin-config.sh.in
 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
-Patch10:	npplayer-xid.patch
-Patch11:	nspluginwrapper-1.3.0-racecond.patch
 Patch100:	plugin-config-setuid.patch
 Patch101:	plugin-config-umask.patch
 Patch102:	plugin-config-print.patch
@@ -99,7 +93,7 @@ Patch104:	plugin-config-time-check.patch
 
 License:	GPLv2+
 Group:		Applications/Internet
-URL:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
+URL:		http://nspluginwrapper.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Provides:	%{name} = %{version}-%{release}
@@ -143,16 +137,10 @@ This package consists in:
 
 # Installation & build patches
 %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
-%patch10 -p1 -b .xid
-%patch11 -p1 -b .racecond
 
 # Plugin-config patches
 pushd %plugin_config_name
@@ -179,29 +167,24 @@ popd
 
 # set the propper built options
 %if "%{target_bits}" == "64"
-    export LDFLAGS="-m64 -L%{libdir64}"
+    export LDFLAGS="-m64 -L%{libdir64} -ldl"
 %else
-    export LDFLAGS="-m32 -L%{libdir32}"
+    export LDFLAGS="-m32 -L%{libdir32} -ldl"
 %endif
 
-mkdir %{build_dir}
+%__mkdir_p %{build_dir}
 pushd %{build_dir}
 ../configure 					\
 	    --prefix=%{_prefix} 		\
 	    --target-cpu=%{_target_cpu}		\
-	    --pkgdir=%{name}			\
 	    --pkglibdir=%{pkgdir}	        \
 	    --with-lib32=%{lib32}		\
 	    --with-lib64=%{lib64}		\
-	    --with-base-lib=%{lib}		\
-	    --with-base-libdir=%{libdir}	\
 	    --viewer-paths=%{pkgdir}		\
-	    --with-x11-prefix=/usr		\
-	    --with-gecko=%{gecko_flavour}	\
 	    --enable-viewer			\
 	    --viewer-paths="%{pkgdir32}:%{pkgdir64}"\
 	    --disable-biarch
-	
+
 %__make
 popd
 
@@ -221,7 +204,7 @@ popd
 
 %__make -C %{build_dir} install DESTDIR=$RPM_BUILD_ROOT
 
-ln -s %{pkgdir}/npwrapper.so $RPM_BUILD_ROOT/%{plugindir}/npwrapper.so
+%__ln_s %{pkgdir}/npwrapper.so $RPM_BUILD_ROOT/%{plugindir}/npwrapper.so
 
 # Install plugin-config utility
 pushd %{plugin_config_name}
@@ -282,13 +265,11 @@ fi;
 %{pkgdir}/npviewer.sh
 %{pkgdir}/npviewer
 %{pkgdir}/npplayer
-%{pkgdir}/libxpcom.so
 %{pkgdir}/libnoxshm.so
 %{pkgdir}/nspluginplayer
 %{plugindir}/npwrapper.so
 %{_bindir}/mozilla-plugin-config
 %config %{_sysconfdir}/sysconfig/%{name}
-
 ## <mozilla-filesystem>
 /usr/lib*/mozilla
 %{_datadir}/mozilla
@@ -310,7 +291,6 @@ fi;
 %{pkgdir}/npviewer.sh
 %{pkgdir}/npviewer
 %{pkgdir}/npplayer
-%{pkgdir}/libxpcom.so
 %{pkgdir}/libnoxshm.so
 %{pkgdir}/nspluginplayer
 %{plugindir}/npwrapper.so
@@ -318,6 +298,11 @@ fi;
 
 
 %changelog
+* Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.4.4-1
+- new upstream release based on Fedora rawhide
+- supported native Linux x86_64 flash-plugin
+  - added libflashplayer to ignored plugins (exclude_list)
+
 * Fri Apr 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.3.0-4
 - added spice-xpi to ignored plugins
 - applied some improvement patches from Fedora rawhide

nonfree/install-assist-flash-plugin/install-assist-flash-plugin-vl.spec

@@ -1,12 +1,19 @@
 %define pkgname flash-plugin
-%define pkgversion	10.3.183.10
-%define dlurl	http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-%{pkgversion}-release.i386.rpm
+%define pkgversion	11.0.1.152
+%define dlurl	http://fpdownload.macromedia.com/get/flashplayer/current/flash-plugin-%{pkgversion}-release.%{target_arch}.rpm
 
-Summary:	Package to assist installation of Adobe Flash Player (i386)
-Summary(ja): 	Adobe Flash Player (i386) のインストールを補助するパッケージ
+%ifarch %{ix86}
+%define target_arch i386
+%endif
+%ifarch x86_64
+%define target_arch x86_64
+%endif
+
+Summary:	Package to assist installation of Adobe Flash Player (%{target_arch})
+Summary(ja): 	Adobe Flash Player (%{target_arch}) のインストールを補助するパッケージ
 Name:		install-assist-%{pkgname}
 Version:	%{pkgversion}
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 ## This spec Source0 is obsolete
 Source0:	%{pkgname}.spec
 License:	Commercial
@@ -35,7 +42,7 @@ Packager:	kazutaka, munepi
 
 
 %description
-Adobe Flash Player %{pkgversion} (i386)
+Adobe Flash Player %{pkgversion} (%{target_arch})
 
 If you install this package, it automaticaly downloads 
 required files to install %{pkgname}.
@@ -44,7 +51,7 @@ installation is executed by apt-get command or synaptic
 package manager.
 
 %description -l ja
-Adobe Flash Player %{pkgversion} (i386)
+Adobe Flash Player %{pkgversion} (%{target_arch})
 
 このパッケージをインストールすると、自動的に %{pkgname}
 のインストールに必要な rpm ファイルをダウンロードします。
@@ -75,6 +82,12 @@ exit 0
 
 
 %changelog
+* Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-2
+- supportted native linux 64-bit flash-plugin
+
+* Thu Oct  6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 11.0.1.152-1
+- new upstream release
+
 * Fri Sep 23 2011 Munehiro Yamamoto <munepi@vinelinux.org> 10.3.183.10-1
 - new upstream release