|
|
@@ -4,14 +4,14 @@
|
|
|
%define make_debug_package 0
|
|
|
|
|
|
# What gecko we use
|
|
|
-%define gecko_flavour "mozilla"
|
|
|
+%define gecko_flavour "mozilla"
|
|
|
|
|
|
%define plugin_config_version 1.9
|
|
|
%define plugin_config_name plugin-config-%{plugin_config_version}
|
|
|
%define plugin_config_binary plugin-config
|
|
|
|
|
|
# Excluded plugins (separated by ':')
|
|
|
-%define exclude_list "libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*:librhythmbox*:packagekit*"
|
|
|
+%define exclude_list "libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*:librhythmbox*:packagekit*:libnsISpicec*"
|
|
|
|
|
|
# Target defines
|
|
|
%if "%{_target_cpu}" == "i386"
|
|
|
@@ -59,7 +59,7 @@
|
|
|
%define build_dir objs-%{target_bits}
|
|
|
|
|
|
%if "%{target_bits}" == "32"
|
|
|
-%define lib %{lib32}
|
|
|
+%define lib %{lib32}
|
|
|
%define libdir %{libdir32}
|
|
|
%define pkgdir %{pkgdir32}
|
|
|
%define plugindir %{plugindir32}
|
|
|
@@ -75,24 +75,26 @@
|
|
|
Summary: A compatibility layer for Netscape 4 plugins
|
|
|
Name: nspluginwrapper
|
|
|
Version: 1.3.0
|
|
|
-Release: 3%{?_dist_release}
|
|
|
-Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
|
|
|
-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
|
|
|
+Release: 4%{?_dist_release}
|
|
|
+Source0: http://gwenole.beauchesne.info/projects/nspluginwrapper/files/%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
|
|
|
+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
|
|
|
-Patch100: plugin-config-setuid.patch
|
|
|
-Patch101: plugin-config-umask.patch
|
|
|
-Patch102: plugin-config-print.patch
|
|
|
-Patch103: plugin-config-native.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
|
|
|
+Patch103: plugin-config-native.patch
|
|
|
Patch104: plugin-config-time-check.patch
|
|
|
|
|
|
License: GPLv2+
|
|
|
@@ -149,6 +151,8 @@ This package consists in:
|
|
|
%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
|
|
|
@@ -203,7 +207,7 @@ popd
|
|
|
|
|
|
#Build plugin configuration utility
|
|
|
pushd %{plugin_config_name}
|
|
|
-./configure --prefix=%{_prefix} CFLAGS="$RPM_OPT_FLAGS"
|
|
|
+./configure --prefix=%{_prefix} --libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS"
|
|
|
%__make
|
|
|
popd
|
|
|
|
|
|
@@ -314,6 +318,14 @@ fi;
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* 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
|
|
|
+ * Wed Mar 09 2011 Peter Hatina <phatina@redhat.coom> 1.3.0-18
|
|
|
+ - Race condition patch
|
|
|
+ * Wed Jun 30 2010 Martin Stransky <stransky@redhat.com> 1.3.0-14
|
|
|
+ - fixed patch for rhbz#523273
|
|
|
+
|
|
|
* 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
|
munepi