From c41255b08c43bc293c4ab5a3527d64339af03aa8bd1180ea58660fc875f37d47 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 24 Jul 2014 15:47:04 +0000 Subject: [PATCH 1/2] symbol versions on top OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=15 --- libxkbcommon.changes | 5 +++++ libxkbcommon.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libxkbcommon.changes b/libxkbcommon.changes index e826bdf..1bd2395 100644 --- a/libxkbcommon.changes +++ b/libxkbcommon.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 24 15:46:08 UTC 2014 - jengelh@inai.de + +- Add symbol versioning to xkbcommon + ------------------------------------------------------------------- Wed May 21 12:28:41 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/libxkbcommon.spec b/libxkbcommon.spec index ed068aa..ebf7fb2 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -24,8 +24,7 @@ License: MIT Group: Development/Libraries/C and C++ Url: http://xkbcommon.org/ -#Git-Clone: git://anongit.freedesktop.org/xorg/lib/libxkbcommon -#Git-Web: http://cgit.freedesktop.org/xorg/lib/libxkbcommon/ +#Git-Clone: git://github.com/xkbcommon/libxkbcommon Source: http://xkbcommon.org/download/%name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.62 @@ -116,7 +115,10 @@ extra_opts=--disable-x11 %endif # Ensure people will use pkgconfig to locate headers. %configure --disable-static --includedir="%_includedir/pkg/%name" $extra_opts -make %{?_smp_mflags} V=1; +# libxkbcommon has added symbols between 0.2.0..0.4.2 without maintenance; +# force some versioning. +echo "V_%version { global: *; };" >xkb.sym +make %{?_smp_mflags} V=1 LDFLAGS="-Wl,--version-script=$PWD/xkb.sym" %install make install DESTDIR="%buildroot"; From 1cf2b4bfe8b40107b182d9c8e351dbaea8c15bf406530a7f5c0a45bf990c8d4d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 31 Jul 2014 16:12:34 +0000 Subject: [PATCH 2/2] Ship baselibs.conf OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libxkbcommon?expand=0&rev=16 --- libxkbcommon.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libxkbcommon.spec b/libxkbcommon.spec index ebf7fb2..751fc18 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -26,6 +26,7 @@ Url: http://xkbcommon.org/ #Git-Clone: git://github.com/xkbcommon/libxkbcommon Source: http://xkbcommon.org/download/%name-%version.tar.xz +Source2: baselibs.conf BuildRoot: %{_tmppath}/%{name}-%{version}-build #git#BuildRequires: autoconf >= 2.62 #git#BuildRequires: automake