Mailinglist Archive: opensuse-commit (1262 mails)

< Previous Next >
commit xaw3d
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 13 Sep 2006 01:42:25 +0200 (CEST)
  • Message-id: <20060912234225.B6C8518BAE9@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xaw3d
checked in at Wed Sep 13 01:42:25 CEST 2006.

--------
--- xaw3d/xaw3d.changes 2006-08-16 18:05:29.000000000 +0200
+++ xaw3d/xaw3d.changes 2006-09-12 19:20:18.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Sep 12 19:10:16 CEST 2006 - schwab@xxxxxxx
+
+- Fix soname of overriding libraries [#205169].
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xaw3d.spec ++++++
--- /var/tmp/diff_new_pack.ZLBLiD/_old 2006-09-13 01:42:02.000000000 +0200
+++ /var/tmp/diff_new_pack.ZLBLiD/_new 2006-09-13 01:42:02.000000000 +0200
@@ -17,7 +17,7 @@
Provides: Xaw3d
Autoreqprov: on
Version: 1.5E
-Release: 241
+Release: 245
Summary: 3D Athena Widgets
Url: http://www.visi.com/~hawkeyd/xaw3d.html
Source: Xaw3d-1.5E.tar.bz2
@@ -127,11 +127,11 @@
%build
cd lib/Xaw3d
make CC='gcc -g' CCOPTIONS="$RPM_OPT_FLAGS"
-make SOXAWREV=6.1
+make XAWLIBNAME=Xaw6 SOXAWREV=6.1

%install
cd lib/Xaw3d
-make DESTDIR=%{buildroot} install SOXAWREV=6.1
+make DESTDIR=%{buildroot} install XAWLIBNAME=Xaw6 SOXAWREV=6.1
rm -rf %{buildroot}%{_includedir}/X11/Xaw3d
mkdir -p %{buildroot}%{_includedir}X11/Xaw3d
rm -rf %{buildroot}%{_includedir}/Xaw3d
@@ -140,7 +140,7 @@
make DESTDIR=%{buildroot} install.man
mkdir -p %{buildroot}%{_docdir}/xaw3d
install -c -m 0444 README.XAW3D %{buildroot}%{_docdir}/xaw3d
-rm -f %{buildroot}%{_libdir}/Xaw3d/libXaw.so
+rm -f %{buildroot}%{_libdir}/Xaw3d/libXaw*.so
install -c -m 0444 NOTE %{buildroot}%{_docdir}/xaw3d/README.SuSE
ln -sf %{_docdir}/xaw3d/README.SuSE %{buildroot}%{_libdir}/Xaw3d/NOTE
# removing unwanted file
@@ -174,14 +174,16 @@
%files -n xaw3dd
%defattr(-,root,root)
%dir %{_libdir}/Xaw3d
-%{_libdir}/Xaw3d/libXaw.so.6
-%{_libdir}/Xaw3d/libXaw.so.6.1
-%{_libdir}/Xaw3d/libXaw.so.8
-%{_libdir}/Xaw3d/libXaw.so.8.0
+%{_libdir}/Xaw3d/libXaw6.so.6
+%{_libdir}/Xaw3d/libXaw6.so.6.1
+%{_libdir}/Xaw3d/libXaw8.so.8
+%{_libdir}/Xaw3d/libXaw8.so.8.0
%doc %{_libdir}/Xaw3d/NOTE
%{_docdir}/xaw3d/README.SuSE

%changelog -n xaw3d
+* Tue Sep 12 2006 - schwab@xxxxxxx
+- Fix soname of overriding libraries [#205169].
* Wed Aug 16 2006 - aj@xxxxxxx
- Remove unneeded BuildRequires on xorg-x11.
* Fri Jul 28 2006 - werner@xxxxxxx

++++++ Xaw3d-1.5E.dif ++++++
--- /var/tmp/diff_new_pack.ZLBLiD/_old 2006-09-13 01:42:03.000000000 +0200
+++ /var/tmp/diff_new_pack.ZLBLiD/_new 2006-09-13 01:42:03.000000000 +0200
@@ -1,5 +1,5 @@
--- .pkgextract
-+++ .pkgextract 2005-11-29 15:57:35.000000000 +0100
++++ .pkgextract
@@ -0,0 +1,8 @@
+patch -p0 -s --suffix='.secure' < ../../../Xaw3d-1.5E-secure.patch
+patch -p0 -s --suffix='.thumb' < ../../../Xaw3d-1.5E-thumb.patch
@@ -10,7 +10,7 @@
+patch -p0 -s --suffix='.font' < ../../../Xaw3d-1.5E-fontset.patch
+patch -p3 -s --suffix='.null' < ../../../Xaw3d-1.5E-null.patch
--- Imakefile
-+++ Imakefile 2005-11-29 15:57:35.000000000 +0100
++++ Imakefile
@@ -1,15 +1,11 @@
-#ifndef XCOMM
-#define XCOMM #
@@ -46,7 +46,7 @@

#ifdef SharedXawReqs
REQUIREDLIBS = SharedXawReqs
-@@ -82,8 +84,17 @@
+@@ -82,8 +84,18 @@
OBJS = $(BASE_OBJS)
#endif

@@ -54,10 +54,11 @@
+#define ForceNormalLib YES
#include <Library.tmpl>

-+SharedLibraryTarget(Xaw,$(SoRev),$(OBJS),.,.)
-+SharedLibraryDataTarget(Xaw,$(SoRev),$(UNSHAREDOBJS))
-+InstallSharedLibrary(Xaw,$(SoRev),$(SHLIBDIR)/Xaw3d)
-+InstallSharedLibraryData(Xaw,$(SoRev),$(SHLIBDIR)/Xaw3d)
++XAWLIBNAME = Xaw8
++SharedLibraryTarget($(XAWLIBNAME),$(SoRev),$(OBJS),.,.)
++SharedLibraryDataTarget($(XAWLIBNAME),$(SoRev),$(UNSHAREDOBJS))
++InstallSharedLibrary($(XAWLIBNAME),$(SoRev),$(SHLIBDIR)/Xaw3d)
++InstallSharedLibraryData($(XAWLIBNAME),$(SoRev),$(SHLIBDIR)/Xaw3d)
+CDEBUGFLAGS = -O2 -pipe -Wall -fno-strict-aliasing
+_NULLCMD_ = @echo -n
+
@@ -65,7 +66,7 @@
SpecialCObjectRule(sharedlib.o,NullParameter,$(SHLIBDEF))
#endif
--- List.c
-+++ List.c 2005-11-29 15:57:35.000000000 +0100
++++ List.c
@@ -38,6 +38,7 @@

#include "Xaw3dP.h"
@@ -75,7 +76,7 @@
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
--- MultiSink.c
-+++ MultiSink.c 2005-11-29 15:57:35.000000000 +0100
++++ MultiSink.c
@@ -81,6 +81,7 @@
#include <X11/Xaw3d/TextP.h>
#include "XawI18n.h"
@@ -85,35 +86,35 @@

#ifdef GETLASTPOS
--- NOTE
-+++ NOTE 2005-11-29 15:57:35.000000000 +0100
++++ NOTE
@@ -0,0 +1,25 @@
+Note:
+
-+ This /usr/X11R6/lib/Xaw3d/libXaw.so.6.1 is a real
-+ libXaw3d.so.7.0 linked with `-soname libXaw.so.7'.
++ This /usr/lib/Xaw3d/libXaw8.so.8.0 is a real
++ libXaw3d.so.8.0 linked with `-soname libXaw8.so.8'.
+
-+ Therfore do _NOT_ replace /usr/X11R6/lib/libXaw.so.7.0
-+ by /usr/X11R6/lib/Xaw3d/libXaw.so.7.0
++ Therfore do _NOT_ replace /usr/lib/libXaw8.so.8.0.0
++ by /usr/lib/Xaw3d/libXaw.so.8.0
+
+ On any problem starting X11 programs please remove the
+ package xaw3dd.
+
+Achtung:
+
-+ Die Bibliothek /usr/X11R6/lib/Xaw3d/libXaw.so.7.0 ist
-+ in Wirklichkeit eine libXaw3d.so.7.0, die mit der
-+ Option `-soname libXaw.so.7' gelinkt wurde.
++ Die Bibliothek /usr/lib/Xaw3d/libXaw8.so.8.0 ist
++ in Wirklichkeit eine libXaw3d.so.8.0, die mit der
++ Option `-soname libXaw8.so.8' gelinkt wurde.
+
-+ Darum ersetzten Sie auf KEINEN Fall /usr/X11R6/lib/libXaw.so.7.0
-+ durch /usr/X11R6/lib/Xaw3d/libXaw.so.7.0.
++ Darum ersetzten Sie auf KEINEN Fall /usr/lib/libXaw8.so.8.0.0
++ durch /usr/lib/Xaw3d/libXaw8.so.8.0.
+
+ Falls Sie irgendwelche Probleme mit X11-Programmen haben,
+ deinstallieren Sie das Paket xaw3dd.
+
+
-+Werner Fink <werner@xxxxxxxxxxx>
++Werner Fink <feedback@xxxxxxx>
--- Scrollbar.c
-+++ Scrollbar.c 2005-11-29 15:57:35.000000000 +0100
++++ Scrollbar.c
@@ -155,9 +155,8 @@

#ifdef XAW_ARROW_SCROLLBARS
@@ -151,7 +152,7 @@
/* ARGSUSED */
static void StartScroll (w, event, params, num_params )
--- SimpleMenu.c
-+++ SimpleMenu.c 2005-11-29 15:57:35.000000000 +0100
++++ SimpleMenu.c
@@ -1352,7 +1352,7 @@
SimpleMenuWidget smw = (SimpleMenuWidget)w;
SmeObject *entry;
@@ -162,7 +163,7 @@
if (smw->simple_menu.left_whitespace || smw->simple_menu.right_whitespace)
{
--- Text.c
-+++ Text.c 2005-11-29 15:57:35.000000000 +0100
++++ Text.c
@@ -58,6 +58,7 @@
#include "XawI18n.h"
#endif
@@ -200,7 +201,7 @@

static void
--- ThreeD.c
-+++ ThreeD.c 2005-11-29 15:57:35.000000000 +0100
++++ ThreeD.c
@@ -38,6 +38,7 @@
#include <X11/IntrinsicP.h>
#include <X11/Xaw3d/XawInit.h>
@@ -210,7 +211,7 @@

/* Initialization of defaults */
--- Tip.c
-+++ Tip.c 2005-11-29 15:57:35.000000000 +0100
++++ Tip.c
@@ -34,6 +34,7 @@

/* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */
@@ -220,7 +221,7 @@
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
--- Xaw3dP.c
-+++ Xaw3dP.c 2005-11-29 15:57:35.000000000 +0100
++++ Xaw3dP.c
@@ -78,7 +78,7 @@
Display *dpy;
XpmImage image;
@@ -231,7 +232,7 @@

if (pm == None)
--- XawI18n.h
-+++ XawI18n.h 2005-11-29 15:57:35.000000000 +0100
++++ XawI18n.h
@@ -27,6 +27,13 @@

********************************************************/
@@ -247,7 +248,7 @@
#include <wctype.h>
#ifndef NO_WIDEC_H
--- laylex.l
-+++ laylex.l 2005-11-29 15:57:35.000000000 +0100
++++ laylex.l
@@ -86,12 +86,14 @@
return i;
}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread