OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=66

xcb-util-0.3.4.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eeb723e9be5fa1e6d9c5cf223731d43a9589b4d727b11c2d310bd6157f408d26
-size 260359

xcb-util-0.3.5.diff

@@ -0,0 +1,10 @@
+--- event/event.c.orig	2009-05-29 19:05:59.274261734 +0200
++++ event/event.c	2009-05-29 19:06:47.128402256 +0200
+@@ -28,6 +28,7 @@
+ 
+ #include <assert.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "xcb_event.h"
+ #include "../xcb-util-common.h"

xcb-util-0.3.5.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:484097ce4a847894d239ee505c8db1249950ef8b4be6dc1fdd1929de2d4e0f25
+size 262991

xorg-x11-libs.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Fri May 29 18:31:51 CEST 2009 - sndirsch@suse.de
+
+- xcb-util 0.3.5
+  * various issues fixed 
+
+-------------------------------------------------------------------
+Thu Apr 30 22:40:53 CEST 2009
+
+- fix a version typo that prevented the .la files to be found for
+  11.0 <= version <= 11.1
+
+-------------------------------------------------------------------
+Thu Apr 30 21:53:45 CEST 2009
+
+- pack .la files in devel package
+
+-------------------------------------------------------------------
+Thu Apr 30 20:35:27 CEST 2009 - eich@suse.de
+
+- move static libraries to devel package
+
+-------------------------------------------------------------------
+Thu Apr 30 18:55:01 CEST 2009 - sndirsch@suse.de
+
+- build static libraries for versions <= 11.1
+
 -------------------------------------------------------------------
 Sat Apr 25 04:47:13 CEST 2009 - sndirsch@suse.de
 

xorg-x11-libs.spec

@@ -32,8 +32,8 @@ Obsoletes:      xorg-x11-libs-64bit
 #
 Url:            http://xorg.freedesktop.org/
 Version:        7.4
-Release:        19
+Release:        20
-License:        X11/MIT
+License:        GPL v2 or later; X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
 Summary:        Remaining X.Org libraries
@@ -68,12 +68,13 @@ Source27:       libXres-1.0.3.tar.bz2
 Source28:       libXft1-X11R6.9-1.2.tar.bz2
 Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
-Source31:       xcb-util-0.3.4.tar.bz2
+Source31:       xcb-util-0.3.5.tar.bz2
 Source33:       libpciaccess-0.10.6.tar.bz2
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch3:         p_xft_cjk.diff
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
+Patch11:        xcb-util-0.3.5.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -103,7 +104,7 @@ Authors:
     Susan Angebrandt
 
 %package -n xorg-x11-devel
-License:        X11/MIT
+License:        GPL v2 or later; X11/MIT
 Summary:        Include Files and Libraries mandatory for X11 Development
 Group:          Development/Libraries/X11
 Provides:       xorg-x11-compat70-devel xorg-x11-man XFree86-devel
@@ -230,6 +231,9 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
+pushd xcb-util-*
+%patch11 -p0
+popd
 
 %build
 for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -242,7 +246,11 @@ for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
       *) 
         echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
         export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-        %configure --disable-static --with-pic --enable-type1 ${option}
+        %configure \
+%if %suse_version > 1110
+        --disable-static \
+%endif
+        --with-pic --enable-type1 ${option}
         ;;
     esac
     %{__make} %{?jobs:-j%jobs}
@@ -257,7 +265,7 @@ for dir in xbitmaps-* $(ls | grep -v xbitmap); do
 done
 /sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib
 mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/
-%if %suse_version > 1100
+%if %suse_version > 1110
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 %endif
 
@@ -298,6 +306,10 @@ exit 0
 /usr/include/xcb/
 /usr/%{_lib}/*.so
 %exclude /usr/%{_lib}/libpciaccess.so.0*
+%if %suse_version <= 1110
+/usr/%{_lib}/*.a
+/usr/%{_lib}/*.la
+%endif
 /usr/%{_lib}/pkgconfig/*.pc
 /usr/share/aclocal/*.m4
 %{_mandir}/man1/*
@@ -313,6 +325,18 @@ exit 0
 /usr/%{_lib}/libpciaccess.so
 
 %changelog
+* Fri May 29 2009 sndirsch@suse.de
+- xcb-util 0.3.5
+  * various issues fixed
+  Thu Apr 30 22:40:53 CEST 2009
+- fix a version typo that prevented the .la files to be found for
+  11.0 <= version <= 11.1
+  Thu Apr 30 21:53:45 CEST 2009
+- pack .la files in devel package
+* Thu Apr 30 2009 eich@suse.de
+- move static libraries to devel package
+* Thu Apr 30 2009 sndirsch@suse.de
+- build static libraries for versions <= 11.1
 * Sat Apr 25 2009 sndirsch@suse.de
 - libpciaccess 0.10.6
 * Tue Apr 21 2009 crrodriguez@suse.de