rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.4-rh.patch, 1.3, 1.4 nspluginwrapper.spec, 1.5, 1.6
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Tue Aug 7 15:38:03 UTC 2007
Author: stransky
Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1054
Modified Files:
nspluginwrapper-0.9.91.4-rh.patch nspluginwrapper.spec
Log Message:
removed fake libxpcom
nspluginwrapper-0.9.91.4-rh.patch:
Index: nspluginwrapper-0.9.91.4-rh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.4-rh.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nspluginwrapper-0.9.91.4-rh.patch 7 Aug 2007 12:33:39 -0000 1.3
+++ nspluginwrapper-0.9.91.4-rh.patch 7 Aug 2007 15:37:30 -0000 1.4
@@ -1,5 +1,5 @@
--- nspluginwrapper-0.9.91.4/Makefile.rh 2007-04-03 07:31:22.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/Makefile 2007-08-06 13:43:16.000000000 +0200
++++ nspluginwrapper-0.9.91.4/Makefile 2007-08-07 17:24:17.000000000 +0200
@@ -52,23 +52,6 @@ ifneq (,$(findstring $(OS),netbsd dragon
X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
endif
@@ -64,14 +64,16 @@
ifeq ($(TARGET_ARCH),i386)
npviewer_MAPFILE = $(SRC_PATH)/src/npw-viewer.map
endif
-@@ -120,13 +92,15 @@ libxpcom_LIBRARY = libxpcom.so
- libxpcom_RAWSRCS = libxpcom.c debug.c
- libxpcom_SOURCES = $(libxpcom_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
- libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o)
--libxpcom_CFLAGS = -fPIC
-+libxpcom_CFLAGS = $(CFLAGS) -fPIC
-+libxpcom_LDFLAGS = $(LDFLAGS)
+@@ -116,17 +88,12 @@ npviewer_OBJECTS += npviewer-cxxabi-comp
+ npviewer_LDFLAGS += -lsupc++
+ endif
+-libxpcom_LIBRARY = libxpcom.so
+-libxpcom_RAWSRCS = libxpcom.c debug.c
+-libxpcom_SOURCES = $(libxpcom_RAWSRCS:%.c=$(SRC_PATH)/src/%.c)
+-libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o)
+-libxpcom_CFLAGS = -fPIC
+-
npconfig_PROGRAM = npconfig
-npconfig_RAWSRCS = npw-config.c
+npconfig_RAWSRCS = npw-config.c npw-dir.c
@@ -83,18 +85,18 @@
ifneq (,$(findstring $(OS),netbsd dragonfly))
# We will try to dlopen() the native plugin library. If that lib is
# linked against libpthread, then so must our program too.
-@@ -142,10 +116,8 @@ CPPFLAGS = -I. -I$(SRC_PATH)
+@@ -142,10 +109,7 @@ CPPFLAGS = -I. -I$(SRC_PATH)
TARGETS = $(npconfig_PROGRAM)
TARGETS += $(nploader_PROGRAM)
TARGETS += $(npwrapper_LIBRARY)
-ifeq ($(build_viewer),yes)
TARGETS += $(npviewer_PROGRAM)
- TARGETS += $(libxpcom_LIBRARY)
+-TARGETS += $(libxpcom_LIBRARY)
-endif
archivedir = files/
SRCARCHIVE = $(PACKAGE)-$(VERSION)$(VERSION_SUFFIX).tar
-@@ -183,67 +155,35 @@ clean:
+@@ -183,67 +147,30 @@ clean:
distclean: clean
rm -f config-host.* config.*
@@ -107,18 +109,17 @@
- rmdir $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)
- rmdir $(DESTDIR)$(pkglibdir)/$(ARCH_32)
-endif
-+uninstall: uninstall.wrapper uninstall.viewer uninstall.libxpcom uninstall.loader uninstall.config
++uninstall: uninstall.wrapper uninstall.viewer uninstall.loader uninstall.config
uninstall.wrapper:
- rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
+ rm -f $(DESTDIR)$(pkglibdir)/$(npwrapper_LIBRARY)
uninstall.viewer:
- rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM)
- rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM:%.bin=%)
+-uninstall.libxpcom:
+- rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY)
+ rm -f $(DESTDIR)$(pkglibdir)/$(npviewer_PROGRAM)
+ rm -f $(DESTDIR)$(pkglibdir)/$(npviewer_PROGRAM:%.bin=%)
- uninstall.libxpcom:
-- rm -f $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY)
-+ rm -f $(DESTDIR)$(pkglibdir)/$(libxpcom_LIBRARY)
uninstall.loader:
- rm -f $(DESTDIR)$(pkglibdir)/noarch/$(nploader_PROGRAM)
+ rm -f $(DESTDIR)$(pkglibdir)/$(nploader_PROGRAM)
@@ -130,7 +131,7 @@
+ rm -f $(DESTDIR)$(pkglibdir)/$(npconfig_PROGRAM)
-install: install.dirs install.wrapper install.viewer install.libxpcom install.loader install.config install.mkruntime
-+install: install.dirs install.wrapper install.viewer install.libxpcom install.loader install.config
++install: install.dirs install.wrapper install.viewer install.loader install.config
install.dirs:
- mkdir -p $(DESTDIR)$(pkglibdir)/noarch
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)
@@ -144,13 +145,13 @@
- install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
-ifeq ($(build_viewer),yes)
-install.viewer: install.viewer.bin install.viewer.glue
-+ install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(npwrapper_LIBRARY)
-+install.viewer: install.viewer.bin
- install.libxpcom: do.install.libxpcom
+-install.libxpcom: do.install.libxpcom
-else
-install.viewer:
-install.libxpcom:
-endif
++ install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(npwrapper_LIBRARY)
++install.viewer: install.viewer.bin
+
install.viewer.bin: $(npviewer_PROGRAM)
- install -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(npviewer_PROGRAM)
@@ -161,10 +162,9 @@
- echo "TARGET_ARCH=$(TARGET_ARCH)" >> $$p; \
- echo ". $(pkglibdir)/noarch/$(nploader_PROGRAM)" >> $$p; \
- chmod 755 $$p
-+ install -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npviewer_PROGRAM)
- do.install.libxpcom: $(libxpcom_LIBRARY)
+-do.install.libxpcom: $(libxpcom_LIBRARY)
- install -m 755 $(STRIP_OPT) $(libxpcom_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)/$(libxpcom_LIBRARY)
-+ install -m 755 $(STRIP_OPT) $(libxpcom_LIBRARY) $(DESTDIR)$(pkglibdir)/$(libxpcom_LIBRARY)
++ install -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npviewer_PROGRAM)
install.config: $(npconfig_PROGRAM)
- install -m 755 $(STRIP_OPT) $(npconfig_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM)
- mkdir -p $(DESTDIR)$(bindir)
@@ -178,7 +178,7 @@
$(archivedir)::
[ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1
-@@ -291,35 +231,41 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
+@@ -291,35 +218,35 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
$(CC) -o $@ -c $< -fPIC $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
$(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
@@ -191,15 +191,13 @@
npviewer-%.o: $(SRC_PATH)/src/%.cpp
- $(CXX) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
-+ $(CXX) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
-
- $(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
+-
+-$(libxpcom_LIBRARY): $(libxpcom_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
- $(CC) $(LDFLAGS_32) -shared -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,--soname,libxpcom.so
-+ $(CC) -shared -o $@ $(libxpcom_OBJECTS) $(libxpcom_LDFLAGS) -Wl,--soname,libxpcom.so
-
- libxpcom-%.o: $(SRC_PATH)/src/%.c
+-
+-libxpcom-%.o: $(SRC_PATH)/src/%.c
- $(CC) $(CFLAGS_32) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
-+ $(CC) -o $@ -c $< $(CPPFLAGS) $(libxpcom_CFLAGS) -DBUILD_XPCOM
++ $(CXX) -o $@ -c $< $(CPPFLAGS) $(npviewer_CFLAGS) -DBUILD_VIEWER
$(npconfig_PROGRAM): $(npconfig_OBJECTS)
$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
@@ -228,7 +226,7 @@
$(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
$(AR) rc $@ $<
-@@ -332,6 +278,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
+@@ -332,6 +259,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
ln -sf libgcc_s.so $@
$(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
@@ -237,7 +235,7 @@
-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
--- nspluginwrapper-0.9.91.4/configure.rh 2007-04-02 23:42:24.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/configure 2007-08-06 13:52:12.000000000 +0200
++++ nspluginwrapper-0.9.91.4/configure 2007-08-07 17:22:54.000000000 +0200
@@ -21,44 +21,16 @@ TMPS="${TMPDIR1}/npw-conf-${RANDOM}-$$-$
# default parameters
@@ -452,7 +450,7 @@
+# check for Gecko compile CFLAGS
+if $pkgconfig --exists firefox-plugin; then
+ GECKO_CFLAGS=`$pkgconfig --cflags firefox-plugin --cflags firefox-xpcom --cflags firefox-gtkmozembed`
-+ GECKO_LDFLAGS=`$pkgconfig --libs firefox-plugin --libs firefox-xpcom --libs firefox-gtkmozembed`
++ GECKO_LDFLAGS=`$pkgconfig --libs firefox-xpcom --libs firefox-plugin --libs firefox-gtkmozembed`
+ GECKO_LIBDIR=`$pkgconfig --libs-only-L firefox-xpcom | sed -e "s|-L||" -e "s| ||g"`
+else
+ echo "gecko-devel not found"
@@ -617,7 +615,7 @@
+echo "DONT_STRIP=yes" >> $config_mak
+
--- nspluginwrapper-0.9.91.4/src/npw-wrapper.c.rh 2007-04-02 21:52:57.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-wrapper.c 2007-08-06 13:43:16.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-wrapper.c 2007-08-07 17:22:54.000000000 +0200
@@ -42,6 +42,7 @@
#include "rpc.h"
@@ -638,8 +636,8 @@
// Cache MIME info and plugin name/description
if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
---- /dev/null 2007-08-06 09:37:34.625861988 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-dir.c 2007-08-06 13:43:16.000000000 +0200
+--- /dev/null 2007-08-07 08:57:36.624430372 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-dir.c 2007-08-07 17:22:54.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -739,7 +737,7 @@
+ return(p_path);
+}
--- nspluginwrapper-0.9.91.4/src/debug.h.rh 2007-03-04 16:01:22.000000000 +0100
-+++ nspluginwrapper-0.9.91.4/src/debug.h 2007-08-06 13:43:16.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/debug.h 2007-08-07 17:22:54.000000000 +0200
@@ -29,7 +29,7 @@ extern void npw_printf(const char *forma
extern void npw_vprintf(const char *format, va_list args) attribute_hidden;
@@ -750,7 +748,7 @@
#else
#define D(x) ;
--- nspluginwrapper-0.9.91.4/src/sysdeps.h.rh 2007-03-04 16:01:22.000000000 +0100
-+++ nspluginwrapper-0.9.91.4/src/sysdeps.h 2007-08-06 13:43:16.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/sysdeps.h 2007-08-07 17:22:54.000000000 +0200
@@ -43,8 +43,8 @@
#define NPW_VIEWER NPW_VIEWER_BASE
#define NPW_WRAPPER_BASE "npwrapper"
@@ -763,7 +761,7 @@
#define NPW_PLUGIN_IDENT_SIZE 32
typedef struct __attribute__((packed)) {
--- nspluginwrapper-0.9.91.4/src/npw-viewer.sh.rh 2007-04-02 21:52:57.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-viewer.sh 2007-08-06 13:43:16.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-viewer.sh 2007-08-07 17:22:54.000000000 +0200
@@ -4,7 +4,13 @@
#
OS="`uname -s`"
@@ -833,8 +831,8 @@
# Expand PATH for RealPlayer package on NetBSD (realplay)
if test "$OS" = "NetBSD"; then
REALPLAYER_HOME="/usr/pkg/lib/RealPlayer"
---- /dev/null 2007-08-06 09:37:34.625861988 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-dir.h 2007-08-06 13:43:16.000000000 +0200
+--- /dev/null 2007-08-07 08:57:36.624430372 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-dir.h 2007-08-07 17:22:54.000000000 +0200
@@ -0,0 +1,35 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -872,7 +870,7 @@
+
+#endif
--- nspluginwrapper-0.9.91.4/src/npw-config.c.rh 2007-04-02 22:42:15.000000000 +0200
-+++ nspluginwrapper-0.9.91.4/src/npw-config.c 2007-08-06 13:43:16.000000000 +0200
++++ nspluginwrapper-0.9.91.4/src/npw-config.c 2007-08-07 17:22:54.000000000 +0200
@@ -38,10 +38,16 @@
#include <pwd.h>
#include <dirent.h>
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nspluginwrapper.spec 7 Aug 2007 12:33:39 -0000 1.5
+++ nspluginwrapper.spec 7 Aug 2007 15:37:30 -0000 1.6
@@ -59,7 +59,7 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
Version: 0.9.91.4
-Release: 11%{?dist}
+Release: 12%{?dist}
Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
Source1: %{plugin_config_name}.tar.gz
Source2: plugin-config.sh.in
@@ -181,7 +181,6 @@
%{pkgdir}/%{plugin_config_binary}
%{pkgdir}/npconfig
-%{pkgdir}/libxpcom.so
%{pkgdir}/npwrapper.so
%{pkgdir}/npviewer.bin
%{pkgdir}/npviewer
@@ -189,6 +188,9 @@
%{_bindir}/mozilla-plugin-config
%changelog
+* Tue Aug 7 2007 Martin Stransky <stransky at redhat.com> 0.9.91.4-12
+- removed fake libxpcom
+
* Mon Aug 6 2007 Martin Stransky <stransky at redhat.com> 0.9.91.4-11
- added gecko dependency
- added plugin configuration utility
More information about the fedora-extras-commits
mailing list