[nspluginwrapper] Update to latest upstream (1.3.2), Added gnash and lightspark to ignored plugins
Martin Stransky
stransky at fedoraproject.org
Tue May 3 13:55:24 UTC 2011
commit 83893ce7ed6eb1373e139a5b0bba95213221afbd
Author: Martin Stransky <stransky at redhat.com>
Date: Tue May 3 15:55:11 2011 +0200
Update to latest upstream (1.3.2), Added gnash and lightspark to ignored plugins
.gitignore | 1 +
npplayer-xid.patch | 88 ----------
nspluginwrapper-1.3.0-comp.patch | 12 +-
nspluginwrapper-1.3.0-configure.patch | 22 ---
nspluginwrapper-1.3.0-inst.patch | 12 --
nspluginwrapper-1.3.0-make.patch | 63 +++----
nspluginwrapper-1.3.0-silent.patch | 63 -------
...rapper-20090625-fix-npident-array-sending.patch | 178 --------------------
nspluginwrapper.spec | 40 ++---
sources | 2 +-
10 files changed, 54 insertions(+), 427 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e219613..b01f29d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ plugin-config-1.9.tar.gz
nspluginwrapper-1.1.4.tar.bz2
nspluginwrapper-1.1.8.tar.bz2
nspluginwrapper-1.3.0.tar.bz2
+/nspluginwrapper-1.3.2.tar.gz
diff --git a/nspluginwrapper-1.3.0-comp.patch b/nspluginwrapper-1.3.0-comp.patch
index ed7f6e5..35052ff 100644
--- a/nspluginwrapper-1.3.0-comp.patch
+++ b/nspluginwrapper-1.3.0-comp.patch
@@ -1,15 +1,15 @@
-diff -up nspluginwrapper-1.3.0/Makefile.comp nspluginwrapper-1.3.0/Makefile
---- nspluginwrapper-1.3.0/Makefile.comp 2010-06-28 15:45:51.000000000 +0200
-+++ nspluginwrapper-1.3.0/Makefile 2010-06-28 15:46:40.000000000 +0200
-@@ -134,11 +134,6 @@ ifneq ($(npviewer_MAPFILE),)
+diff -up nspluginwrapper-1.3.2/Makefile.old nspluginwrapper-1.3.2/Makefile
+--- nspluginwrapper-1.3.2/Makefile.old 2011-04-23 20:47:21.000000000 +0200
++++ nspluginwrapper-1.3.2/Makefile 2011-05-03 14:48:28.665560720 +0200
+@@ -125,11 +125,6 @@ ifneq ($(npviewer_MAPFILE),)
npviewer_LDFLAGS += -Wl,--export-dynamic
npviewer_LDFLAGS += -Wl,--version-script,$(npviewer_MAPFILE)
endif
-ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
-npviewer_SOURCES += $(SRC_PATH)/src/cxxabi-compat.cpp
-npviewer_OBJECTS += npviewer-cxxabi-compat.o
--npviewer_LDFLAGS += -lsupc++
+-npviewer_LIBS += -lsupc++
-endif
ifeq ($(TARGET_OS):$(TARGET_ARCH),solaris:i386)
- npviewer_LDFLAGS += $(libsocket_LDFLAGS)
+ npviewer_LIBS += $(libsocket_LIBS)
endif
diff --git a/nspluginwrapper-1.3.0-make.patch b/nspluginwrapper-1.3.0-make.patch
index 1358722..6d165fd 100644
--- a/nspluginwrapper-1.3.0-make.patch
+++ b/nspluginwrapper-1.3.0-make.patch
@@ -1,46 +1,39 @@
-diff -up nspluginwrapper-1.3.0/Makefile.make nspluginwrapper-1.3.0/Makefile
---- nspluginwrapper-1.3.0/Makefile.make 2009-01-02 15:22:29.000000000 +0100
-+++ nspluginwrapper-1.3.0/Makefile 2009-01-07 13:00:40.000000000 +0100
-@@ -364,13 +364,13 @@ changelog.commit: changelog
- svn commit -m "Generated by svn2cl." ChangeLog
-
- $(npwrapper_LIBRARY): $(npwrapper_OBJECTS)
-- $(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS)
-+ $(CC) -o $@ $(DSO_LDFLAGS) $(npwrapper_OBJECTS) $(npwrapper_LDFLAGS) $(LDFLAGS)
-
- npwrapper-%.os: $(SRC_PATH)/src/%.c
- $(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
-
- $(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
-- $(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS)
-+ $(CC) $(LDFLAGS_32) -o $@ $(npviewer_OBJECTS) $(npviewer_LDFLAGS) $(LDFLAGS)
-
- npviewer-%.o: $(SRC_PATH)/src/%.c
- $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
-@@ -387,19 +387,19 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
- $(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
-
- $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-- $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
-+ $(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,$(LD_soname),libxpcom.so
-
- libxpcom-%.o: $(SRC_PATH)/src/%.c
- $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
+diff -up nspluginwrapper-1.3.2/Makefile.make nspluginwrapper-1.3.2/Makefile
+--- nspluginwrapper-1.3.2/Makefile.make 2011-04-23 20:47:21.000000000 +0200
++++ nspluginwrapper-1.3.2/Makefile 2011-05-03 15:17:49.789380125 +0200
+@@ -104,6 +104,7 @@ npwrapper_CFLAGS = $(CFLAGS) $(X_CFLAGS
+ npwrapper_LDFLAGS = $(LDFLAGS) $(libpthread_LDFLAGS)
+ npwrapper_LIBS = $(X_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
+ npwrapper_LIBS += $(GLIB_LIBS)
++npwrapper_LIBS += $(LDFLAGS)
+
+ npviewer_PROGRAM = npviewer.bin
+ npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c
+@@ -118,6 +119,7 @@ npviewer_LDFLAGS = $(LDFLAGS_32)
+ npviewer_LDFLAGS += $(libpthread_LDFLAGS)
+ npviewer_LIBS = $(GTK_LIBS_32) $(GLIB_LIBS_32) $(X_LIBS_32)
+ npviewer_LIBS += $(libdl_LIBS) $(libpthread_LIBS)
++npviewer_LIBS += $(LDFLAGS)
+ ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
+ npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map
+ endif
+@@ -321,13 +323,13 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
+ $(CC) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
$(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
-- $(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
-+ $(CC) $(LDFLAGS) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,$(LD_soname),libnoxshm.so
+- $(CC) $(DSO_LDFLAGS) $(libnoxshm_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) -Wl,$(LD_soname),libnoxshm.so
++ $(CC) $(LDFLAGS) $(DSO_LDFLAGS) $(libnoxshm_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) -Wl,$(LD_soname),libnoxshm.so
libnoxshm-%.o: $(SRC_PATH)/src/%.c
- $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
+ $(CC) -o $@ -c $< $(CPPFLAGS) $(libnoxshm_CFLAGS)
$(npconfig_PROGRAM): $(npconfig_OBJECTS)
-- $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
-+ $(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS) $(LDFLAGS)
+- $(CC) $(npconfig_LDFLAGS) -o $@ $(npconfig_OBJECTS) $(npconfig_LIBS)
++ $(CC) $(npconfig_LDFLAGS) -o $@ $(npconfig_OBJECTS) $(npconfig_LIBS) $(LDFLAGS)
npconfig-%.o: $(SRC_PATH)/src/%.c
- $(CC) -o $@ -c $< $(CPPFLAGS) $(CFLAGS)
-@@ -425,7 +425,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
+ $(CC) $(npconfig_CFLAGS) -o $@ -c $< $(CPPFLAGS)
+@@ -353,7 +355,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
$(LN_S) libgcc_s.so $@
$(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
diff --git a/nspluginwrapper.spec b/nspluginwrapper.spec
index e3f0432..9a9c96e 100644
--- a/nspluginwrapper.spec
+++ b/nspluginwrapper.spec
@@ -1,3 +1,5 @@
+%define _default_patch_fuzz 2
+
# Compile as a debug package
%define make_debug_package 0
@@ -9,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*"
# Target defines
%if "%{_target_cpu}" == "i386"
@@ -72,22 +74,17 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
-Version: 1.3.0
-Release: 17%{?dist}
-Source0: http://gwenole.beauchesne.info/projects/nspluginwrapper/files/%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
+Version: 1.3.2
+Release: 1%{?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
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
Patch100: plugin-config-setuid.patch
Patch101: plugin-config-umask.patch
Patch102: plugin-config-print.patch
@@ -119,15 +116,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
# Plugin-config patches
pushd %plugin_config_name
@@ -154,9 +146,9 @@ 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}
@@ -164,18 +156,19 @@ 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
+
+# --with-gecko=%{gecko_flavour} \
+# --with-x11-prefix=/usr \
+# --with-base-libdir=%{libdir} \
+# --with-base-lib=%{lib} \
+# --pkgdir=%{name} \
make
popd
@@ -251,7 +244,6 @@ fi;
%{pkgdir}/npviewer.sh
%{pkgdir}/npviewer
%{pkgdir}/npplayer
-%{pkgdir}/libxpcom.so
%{pkgdir}/libnoxshm.so
%{pkgdir}/nspluginplayer
%{plugindir}/npwrapper.so
@@ -260,6 +252,10 @@ fi;
%changelog
+* Tue May 3 2011 Martin Stransky <stransky at redhat.com> 1.3.2-1
+- Update to latest upstream (1.3.2)
+- Added gnash and lightspark to ignored plugins
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 3d2315e..ef75607 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
0a00e94ba608dfea365851af9deb20dc plugin-config-1.9.tar.gz
-188f77bd3427c131ccba4bfdb25892a9 nspluginwrapper-1.3.0.tar.bz2
+0f85e10f3c10b199dbdc188d62d77981 nspluginwrapper-1.3.2.tar.gz
More information about the scm-commits
mailing list