rpms/nspluginwrapper/F-9 nspluginwrapper-1.1.0-build.patch, 1.2, 1.3 nspluginwrapper.spec, 1.50, 1.51
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Fri Jul 18 09:15:34 UTC 2008
Author: stransky
Update of /cvs/pkgs/rpms/nspluginwrapper/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19622
Modified Files:
nspluginwrapper-1.1.0-build.patch nspluginwrapper.spec
Log Message:
* Tue Jul 18 2008 Martin Stransky <stransky at redhat.com> 1.1.0-3
- Enabled experimental stand-alone plugin player
nspluginwrapper-1.1.0-build.patch:
Index: nspluginwrapper-1.1.0-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper-1.1.0-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nspluginwrapper-1.1.0-build.patch 15 Jul 2008 13:53:23 -0000 1.2
+++ nspluginwrapper-1.1.0-build.patch 18 Jul 2008 09:14:47 -0000 1.3
@@ -1,6 +1,6 @@
diff -up nspluginwrapper-1.1.0/configure.build nspluginwrapper-1.1.0/configure
--- nspluginwrapper-1.1.0/configure.build 2008-06-29 22:19:50.000000000 +0200
-+++ nspluginwrapper-1.1.0/configure 2008-07-07 16:26:11.000000000 +0200
++++ nspluginwrapper-1.1.0/configure 2008-07-15 16:48:26.000000000 +0200
@@ -3,6 +3,8 @@
# nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne
# derived from qemu configure script, (C) 2003 Fabrice Bellard
@@ -209,13 +209,15 @@
if test "$host_cpu" = "i386" ; then
echo "ARCH=i386" >> $config_mak
echo "#define HOST_I386 1" >> $config_h
-@@ -666,20 +700,22 @@ if test -n "$fbigendian" ; then
+@@ -665,21 +699,24 @@ if test -n "$fbigendian" ; then
+ echo "#define FLOAT_WORDS_BIGENDIAN $fbigendian" >> $config_h
fi
- echo "SRC_PATH=$source_path" >> $config_mak
+-echo "SRC_PATH=$source_path" >> $config_mak
-echo "build_viewer=$build_viewer" >> $config_mak
--echo "build_player=$build_player" >> $config_mak
+ echo "build_player=$build_player" >> $config_mak
-echo "biarch=$biarch" >> $config_mak
++echo "SRC_PATH=$source_path" >> $config_mak
echo "lib32=$lib32" >> $config_mak
echo "lib64=$lib64" >> $config_mak
echo "prefix=$prefix" >> $config_mak
@@ -239,7 +241,7 @@
VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'`
RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[ ]*/s///p'`
SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ ]*/s///p'`
-@@ -700,8 +736,14 @@ else
+@@ -700,8 +737,14 @@ else
echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
fi
@@ -255,7 +257,7 @@
if test "$has_visibility_attribute" = "yes"; then
echo "#define attribute_hidden __attribute__((visibility(\"hidden\")))" >> $config_h
-@@ -729,9 +771,8 @@ config_h="config.h"
+@@ -729,9 +772,8 @@ config_h="config.h"
echo "/* Automatically generated by configure - do not modify */" > $config_h
echo "#include \"config-host.h\"" >> $config_h
@@ -267,7 +269,7 @@
if test "$target_os" = "linux"; then
echo "TARGET_OS=linux" >> $config_mak
-@@ -772,3 +813,7 @@ if test "$source_path_used" = "yes" ; th
+@@ -772,3 +814,7 @@ if test "$source_path_used" = "yes" ; th
esac
ln -sf $source_path/Makefile Makefile
fi
@@ -277,7 +279,7 @@
+
diff -up nspluginwrapper-1.1.0/Makefile.build nspluginwrapper-1.1.0/Makefile
--- nspluginwrapper-1.1.0/Makefile.build 2008-07-06 22:15:03.000000000 +0200
-+++ nspluginwrapper-1.1.0/Makefile 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/Makefile 2008-07-15 16:50:26.000000000 +0200
@@ -59,23 +59,6 @@ ifneq (,$(findstring $(OS),netbsd dragon
X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
endif
@@ -380,13 +382,13 @@
ifeq ($(build_player),yes)
TARGETS += $(npplayer_PROGRAM)
endif
-@@ -242,56 +210,19 @@ uninstall.config:
+@@ -242,56 +210,26 @@ uninstall.config:
rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM)
uninstall.mkruntime:
rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime
-
-install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config install.mkruntime
-+install: install.dirs install.wrapper install.viewer install.loader install.config
++install: install.dirs install.player install.wrapper install.viewer install.loader install.config
install.dirs:
- mkdir -p $(DESTDIR)$(pkglibdir)/noarch
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)
@@ -395,15 +397,16 @@
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)
-endif
--ifeq ($(build_player),yes)
--install.player: $(npplayer_PROGRAM)
++ mkdir -p $(DESTDIR)$(pkglibdir)
+ ifeq ($(build_player),yes)
+ install.player: $(npplayer_PROGRAM)
- install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM)
-- mkdir -p $(DESTDIR)$(bindir)
++ install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npplayer_PROGRAM)
+ mkdir -p $(DESTDIR)$(bindir)
- $(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer
--else
--install.player:
--endif
-+ mkdir -p $(DESTDIR)$(pkglibdir)
+ else
+ install.player:
+ endif
install.wrapper: $(npwrapper_LIBRARY)
- install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
-ifeq ($(build_viewer),yes)
@@ -445,7 +448,7 @@
$(archivedir)::
[ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1
-@@ -340,13 +271,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
+@@ -340,13 +278,13 @@ 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)
@@ -462,7 +465,7 @@
$(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
-@@ -356,12 +287,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c
+@@ -356,12 +294,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c
npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
@@ -475,7 +478,7 @@
$(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,--soname,libnoxshm.so
-@@ -372,17 +297,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS)
+@@ -372,17 +304,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS)
$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
npconfig-%.o: $(SRC_PATH)/src/%.c
@@ -502,7 +505,7 @@
$(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
$(AR) rc $@ $<
-@@ -395,6 +326,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
+@@ -395,6 +333,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
$(LN_S) libgcc_s.so $@
$(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
@@ -512,7 +515,7 @@
-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
diff -up nspluginwrapper-1.1.0/src/debug.h.build nspluginwrapper-1.1.0/src/debug.h
--- nspluginwrapper-1.1.0/src/debug.h.build 2008-06-21 22:13:34.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/debug.h 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/debug.h 2008-07-15 16:48:26.000000000 +0200
@@ -33,7 +33,7 @@ extern void npw_printf(const char *forma
extern void npw_vprintf(const char *format, va_list args) attribute_hidden;
@@ -524,7 +527,7 @@
#define D(x) ;
diff -up nspluginwrapper-1.1.0/src/npw-config.c.build nspluginwrapper-1.1.0/src/npw-config.c
--- nspluginwrapper-1.1.0/src/npw-config.c.build 2008-06-26 23:44:15.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-15 16:48:26.000000000 +0200
@@ -38,10 +38,15 @@
#include <pwd.h>
#include <dirent.h>
@@ -825,8 +828,8 @@
return 0;
diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.c
---- /dev/null 2008-07-07 15:46:30.273004002 +0200
-+++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-07 16:25:17.000000000 +0200
+--- /dev/null 2008-07-15 15:29:44.189003873 +0200
++++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-15 16:48:26.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -926,8 +929,8 @@
+ return(p_path);
+}
diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.h
---- /dev/null 2008-07-07 15:46:30.273004002 +0200
-+++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-07 16:25:17.000000000 +0200
+--- /dev/null 2008-07-15 15:29:44.189003873 +0200
++++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-15 16:48:26.000000000 +0200
@@ -0,0 +1,35 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -966,7 +969,7 @@
+#endif
diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.build nspluginwrapper-1.1.0/src/npw-viewer.c
--- nspluginwrapper-1.1.0/src/npw-viewer.c.build 2008-07-06 22:47:22.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 16:48:26.000000000 +0200
@@ -54,10 +54,6 @@
#define DEBUG 1
#include "debug.h"
@@ -1064,7 +1067,7 @@
diff -up nspluginwrapper-1.1.0/src/npw-viewer.sh.build nspluginwrapper-1.1.0/src/npw-viewer.sh
--- nspluginwrapper-1.1.0/src/npw-viewer.sh.build 2008-07-06 18:37:56.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-15 16:48:26.000000000 +0200
@@ -4,7 +4,13 @@
#
OS="`uname -s`"
@@ -1130,7 +1133,7 @@
REALPLAYER_HOME="/usr/pkg/lib/RealPlayer"
diff -up nspluginwrapper-1.1.0/src/npw-wrapper.c.build nspluginwrapper-1.1.0/src/npw-wrapper.c
--- nspluginwrapper-1.1.0/src/npw-wrapper.c.build 2008-07-06 22:07:21.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-15 16:48:26.000000000 +0200
@@ -44,6 +44,7 @@
#include "rpc.h"
@@ -1181,7 +1184,7 @@
if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
diff -up nspluginwrapper-1.1.0/src/sysdeps.h.build nspluginwrapper-1.1.0/src/sysdeps.h
--- nspluginwrapper-1.1.0/src/sysdeps.h.build 2008-06-21 22:13:34.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-15 16:48:26.000000000 +0200
@@ -45,8 +45,8 @@
#define NPW_VIEWER NPW_VIEWER_BASE
#define NPW_WRAPPER_BASE "npwrapper"
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-9/nspluginwrapper.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- nspluginwrapper.spec 15 Jul 2008 13:53:23 -0000 1.50
+++ nspluginwrapper.spec 18 Jul 2008 09:14:47 -0000 1.51
@@ -70,7 +70,7 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
Version: 1.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
Source1: %{plugin_config_name}.tar.gz
Source2: plugin-config.sh.in
@@ -87,11 +87,11 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: %{name} = %{version}-%{release}
Requires: %{_bindir}/linux32
-Requires: gecko-libs = %{gecko_ver}
+Requires: gecko-libs >= %{gecko_ver}
Requires: mozilla-filesystem
BuildRequires: pkgconfig gtk2-devel glib2-devel nspr-devel
BuildRequires: libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel
-BuildRequires: gecko-devel = %{gecko_ver}
+BuildRequires: gecko-devel >= %{gecko_ver}
ExclusiveArch: i386 x86_64 ppc
%description
@@ -169,7 +169,7 @@
./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS"
make
popd
-
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -204,6 +204,13 @@
> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+# set up nsplugin player starting script
+%{__cat} > $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer << EOF
+export MOZ_PLUGIN_PATH=%{pluginsourcedir}
+%{pkgdir}/npplayer "$@"
+EOF
+chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -226,11 +233,16 @@
%{pkgdir}/npwrapper.so
%{pkgdir}/npviewer.bin
%{pkgdir}/npviewer
+%{pkgdir}/npplayer
+%{pkgdir}/nspluginplayer
%{plugindir}/npwrapper.so
%{_bindir}/mozilla-plugin-config
%config %{_sysconfdir}/sysconfig/%{name}
%changelog
+* Tue Jul 18 2008 Martin Stransky <stransky at redhat.com> 1.1.0-3
+- Enabled experimental stand-alone plugin player
+
* Tue Jul 15 2008 Martin Stransky <stransky at redhat.com> 1.1.0-2
- Fixed build warnings in our patches
More information about the fedora-extras-commits
mailing list