From fb2dded4443cd0de0d78e7e6f276dca57939e2d645617e7b41529f40318c7020 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 23 Jan 2012 10:57:47 +0000 Subject: [PATCH 1/2] Accepting request 101036 from home:Warhammer40k:x_org_121_test Please review: I think there's a small typo in new method of compiling libxcb-* libs, that leads to wrong RPM-provides. For example (according to build logs): "libxcb-auxso.0" instead "libxcb-aux.so.0" This leads to missing deps when I try to update. Adding missing dot to gcc "-soname" option seems helps to generate correct libxcb-* RPM-provides. //Sorry for my English OBS-URL: https://build.opensuse.org/request/show/101036 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=180 --- xorg-x11-libs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 459a6c1..995b5a7 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -153,7 +153,7 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren version=${ext_version#*:} > xcb-${ext}.c gcc -Wall -ansi -pedantic -c xcb-${ext}.c -fPIC - gcc -shared -Wl,-soname,libxcb-${ext}so.${version} \ + gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \ -o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o done %if %suse_version > 1110 From 2e5c29cb153ba4c0914e37cfa478108a6113b0c6512c815ff9746bc45ba5ca60 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 23 Jan 2012 11:01:24 +0000 Subject: [PATCH 2/2] - fixed typo in generating fake xcb libs; fake xcb libs don't need to be provided explicitely via spec file, since this Provides is already picked up from the generated xcb libs themselves OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=181 --- xorg-x11-libs.changes | 7 +++++++ xorg-x11-libs.spec | 2 -- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes index 02017bf..98ee5ec 100644 --- a/xorg-x11-libs.changes +++ b/xorg-x11-libs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 23 10:59:06 UTC 2012 - sndirsch@suse.com + +- fixed typo in generating fake xcb libs; fake xcb libs don't need + to be provided explicitely via spec file, since this Provides is + already picked up from the generated xcb libs themselves + ------------------------------------------------------------------- Thu Jan 19 10:54:03 UTC 2012 - sndirsch@suse.com diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec index 995b5a7..dcabe39 100644 --- a/xorg-x11-libs.spec +++ b/xorg-x11-libs.spec @@ -23,11 +23,9 @@ BuildRequires: fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libex %ifarch ppc64 s390x x86_64 Provides: libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit) Provides: libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit) -Provides: libxcb-atom.so.1()(64bit) %else Provides: libXaw.so.8 libXaw.so.7 libXaw.so.6 Provides: libXaw8.so.8 libXaw7.so.7 libXaw6.so.6 -Provides: libxcb-atom.so.1 %endif # bug437293 %ifarch ppc64