Hello community, here is the log from the commit of package nspluginwrapper for openSUSE:Factory checked in at 2012-04-12 09:43:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nspluginwrapper (Old) and /work/SRC/openSUSE:Factory/.nspluginwrapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nspluginwrapper", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/nspluginwrapper/nspluginwrapper.changes 2011-11-02 12:08:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nspluginwrapper.new/nspluginwrapper.changes 2012-04-12 09:43:08.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 4 11:40:04 UTC 2012 - [email protected] + +- Add missing x11, xt and xext BuildRequires +- Add nspluginwrapper-1.4.4-glib.patch + +------------------------------------------------------------------- New: ---- nspluginwrapper-1.4.4-glib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nspluginwrapper.spec ++++++ --- /var/tmp/diff_new_pack.JU52K0/_old 2012-04-12 09:43:13.000000000 +0200 +++ /var/tmp/diff_new_pack.JU52K0/_new 2012-04-12 09:43:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nspluginwrapper # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,36 @@ # - Name: nspluginwrapper Version: 1.4.4 Release: 0 -Group: Productivity/Networking/Web/Utilities Summary: Compatibility Layer for Netscape 4 Plug-Ins License: GPL-2.0+ +Group: Productivity/Networking/Web/Utilities Url: http://nspluginwrapper.davidben.net/ Source: %{name}-%{version}.tar.bz2 +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: fix-link.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: curl-devel glib2-devel gtk2-devel +# nspluginwrapper-1.4.4-glib.patch from SVN, remove in next version +Patch1: nspluginwrapper-1.4.4-glib.patch +BuildRequires: curl-devel BuildRequires: gcc-c++ +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xt) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %ifarch x86_64 BuildRequires: gcc-c++-32bit %endif -ExcludeArch: s390 s390x %ix86 Supplements: acroread # Name of platform split package, never used in openSUSE: -Provides: %{name}-%{_arch} = %{version}-%{release} +Provides: %{name}-%{_arch} = %{version} # Name of platform split package, used in openSUSE BS before 11.0: -Provides: %{name}-i386 = %{version}-%{release} -Obsoletes: %{name}-i386 +Provides: %{name}-i386 = %{version} +Obsoletes: %{name}-i386 < %{version} +ExcludeArch: s390 s390x %ix86 %description nspluginwrapper is an Open Source compatibility plugin for Netscape 4 @@ -56,6 +63,7 @@ %prep %setup -q %patch0 -p1 +%patch1 %build # This package failed when testing with -Wl,-as-needed being default. @@ -75,19 +83,17 @@ # lsb-build/stub_libs/libc_main.c export CFLAGS_32="-m32 ${RPM_OPT_FLAGS/-fstack-protector}" %endif -export CFLAGS="${CFLAGS:-%optflags}" +export CFLAGS="${CFLAGS:-%{optflags}}" ./configure\ --prefix=%{_prefix} -#sed -i "s/CC=.*/& $RPM_OPT_FLAGS/" config-host.mak -make %{?jobs:-j%jobs} +#sed -i "s/CC=.*/& %{optflags}/" config-host.mak +make %{?_smp_mflags} %install %makeinstall DONT_STRIP=yes -mkdir -p $RPM_BUILD_ROOT%{_libdir}/browser-plugins -ln -s %{_prefix}/lib/%{name}/%{_arch}/%{_os}/npwrapper.so $RPM_BUILD_ROOT%{_libdir}/browser-plugins/npwrapper.so +mkdir -p %{buildroot}%{_libdir}/browser-plugins +ln -s %{_prefix}/lib/%{name}/%{_arch}/%{_os}/npwrapper.so %{buildroot}%{_libdir}/browser-plugins/npwrapper.so -%clean -rm -rf $RPM_BUILD_ROOT # Trigger on packages that don't have x86_64 equivalent or its # equivalent has less features. # mplayerplug-in is a common name of third party package that may be ++++++ fix-link.patch ++++++ --- /var/tmp/diff_new_pack.JU52K0/_old 2012-04-12 09:43:13.000000000 +0200 +++ /var/tmp/diff_new_pack.JU52K0/_new 2012-04-12 09:43:13.000000000 +0200 @@ -1,13 +1,13 @@ Index: nspluginwrapper-1.4.4/Makefile =================================================================== ---- nspluginwrapper-1.4.4.orig/Makefile 2011-07-01 05:18:57.000000000 +0200 -+++ nspluginwrapper-1.4.4/Makefile 2011-09-16 19:45:36.636047114 +0200 +--- nspluginwrapper-1.4.4.orig/Makefile ++++ nspluginwrapper-1.4.4/Makefile @@ -142,7 +142,7 @@ npplayer_CFLAGS += $(GTK_CFLAGS) $(GLIB npplayer_LDFLAGS = $(LDFLAGS) npplayer_LDFLAGS += $(libpthread_LDFLAGS) npplayer_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS) -npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) -+npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) $(libdl_LIBS) ++npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) $(libdl_LIBS) -lgthread-2.0 libnoxshm_LIBRARY = libnoxshm.so libnoxshm_RAWSRCS = libnoxshm.c ++++++ nspluginwrapper-1.4.4-glib.patch ++++++ Index: src/npw-player.c =================================================================== --- src/npw-player.c.orig +++ src/npw-player.c @@ -25,7 +25,6 @@ #include <unistd.h> #include <glib.h> #include <glib/gstdio.h> -#include <glib/gthread.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
