Hello community,
here is the log from the commit of package wxWidgets for openSUSE:11.4
checked in at Wed May 25 02:16:55 CEST 2011.
--------
--- old-versions/11.4/UPDATES/all/wxWidgets/wxWidgets-ansi.changes
2011-03-29 19:36:07.000000000 +0200
+++ 11.4/wxWidgets/wxWidgets-ansi.changes 2011-05-20 17:33:27.000000000
+0200
@@ -1,0 +2,6 @@
+Tue May 17 20:24:51 CEST 2011 - sbra...@suse.cz
+
+- Create synthetic .la files to work-around libtool failures when
+ linking third level libraries or binaries (bnc#690952).
+
+-------------------------------------------------------------------
wxWidgets-wxcontainer.changes: same change
wxWidgets.changes: same change
calling whatdependson for 11.4-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wxWidgets-ansi.spec ++++++
--- /var/tmp/diff_new_pack.QezkJr/_old 2011-05-25 02:16:33.000000000 +0200
+++ /var/tmp/diff_new_pack.QezkJr/_new 2011-05-25 02:16:33.000000000 +0200
@@ -49,7 +49,7 @@
License: GPLv2+
Group: System/Libraries
Version: 2.8.11
-Release: 3.<RELEASE5>
+Release: 3.<RELEASE6>
%define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//')
# libdir for installing of all the stuff
%if %ENABLE_STL
@@ -736,6 +736,58 @@
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
%endif
+# Create synthetic .la files to work-around libtool inability to link
+# third level libraries built on top of wxWidgets (bnc#690952).
+cd $RPM_BUILD_ROOT%{wxlibdir}
+for LIB in *.so ; do
+ LIBNAME=${LIB%.so}
+ LC_ALL=C
+ LIBNAMES=($LIB*)
+ unset LC_ALL
+ cat >$LIBNAME.la <<EOF
+# $LIBNAME.la - a libtool library file
+# Generated by %{name}.spec (for GNU libtool)
+#
+
+# The name that we can dlopen(3).
+dlname='${LIBNAMES[1]}'
+
+# Names of this library.
+library_names='$(for ((i=${#LIBNAMES[@]}-1;i>=0;i--)); do echo ${LIBNAMES[i]}
; done | tr \\n \ | sed s/\ $// )'
+
+# The name of the static archive.
+old_library=''
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=' -pthread'
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for $LIBNAME.
+current=8
+age=0
+revision=8
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='%{wxlibdir}'
+EOF
+done
+cd -
+
# Create ld.so.conf.d file that provides binary compatibility with third party
binaries.
%if "%{_libdir}" != "%{wxlibdir}"
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
@@ -1248,6 +1300,7 @@
%{_datadir}/bakefile
%{_includedir}/wx-%{wx_minor}
%{wxlibdir}/*.so
+%{wxlibdir}/*.la
%{wxlibdir}/wx/config
%{wxlibdir}/wx/include
%{wxlibdir}/wx/rpm
wxWidgets-wxcontainer.spec: same change
++++++ wxWidgets.spec ++++++
--- /var/tmp/diff_new_pack.QezkJr/_old 2011-05-25 02:16:33.000000000 +0200
+++ /var/tmp/diff_new_pack.QezkJr/_new 2011-05-25 02:16:33.000000000 +0200
@@ -49,7 +49,7 @@
License: GPLv2+
Group: System/Libraries
Version: 2.8.11
-Release: 4.<RELEASE9>
+Release: 4.<RELEASE11>
%define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//')
# libdir for installing of all the stuff
%if %ENABLE_STL
@@ -736,6 +736,58 @@
rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
%endif
+# Create synthetic .la files to work-around libtool inability to link
+# third level libraries built on top of wxWidgets (bnc#690952).
+cd $RPM_BUILD_ROOT%{wxlibdir}
+for LIB in *.so ; do
+ LIBNAME=${LIB%.so}
+ LC_ALL=C
+ LIBNAMES=($LIB*)
+ unset LC_ALL
+ cat >$LIBNAME.la <<EOF
+# $LIBNAME.la - a libtool library file
+# Generated by %{name}.spec (for GNU libtool)
+#
+
+# The name that we can dlopen(3).
+dlname='${LIBNAMES[1]}'
+
+# Names of this library.
+library_names='$(for ((i=${#LIBNAMES[@]}-1;i>=0;i--)); do echo ${LIBNAMES[i]}
; done | tr \\n \ | sed s/\ $// )'
+
+# The name of the static archive.
+old_library=''
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=' -pthread'
+
+# Libraries that this one depends upon.
+dependency_libs=''
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for $LIBNAME.
+current=8
+age=0
+revision=8
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='%{wxlibdir}'
+EOF
+done
+cd -
+
# Create ld.so.conf.d file that provides binary compatibility with third party
binaries.
%if "%{_libdir}" != "%{wxlibdir}"
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
@@ -1248,6 +1300,7 @@
%{_datadir}/bakefile
%{_includedir}/wx-%{wx_minor}
%{wxlibdir}/*.so
+%{wxlibdir}/*.la
%{wxlibdir}/wx/config
%{wxlibdir}/wx/include
%{wxlibdir}/wx/rpm
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
