diff --git a/.cvsignore b/.cvsignore index 36ba6f1..9eac041 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ libxcb-1.2.tar.bz2 xpyb-1.1.tar.bz2 +libxcb-1.3.tar.bz2 diff --git a/libxcb-1.1-no-pthread-stubs.patch b/libxcb-1.1-no-pthread-stubs.patch index 67a09f2..fdea41c 100644 --- a/libxcb-1.1-no-pthread-stubs.patch +++ b/libxcb-1.1-no-pthread-stubs.patch @@ -1,10 +1,10 @@ -diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac ---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 -+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 -@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) +diff -up libxcb-1.3/configure.ac.jx libxcb-1.3/configure.ac +--- libxcb-1.3/configure.ac.jx 2009-07-14 11:40:00.000000000 -0400 ++++ libxcb-1.3/configure.ac 2009-07-14 11:40:38.000000000 -0400 +@@ -33,7 +33,7 @@ AC_SUBST(HTML_CHECK_RESULT) # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1) + PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5) -NEEDED="pthread-stubs xau >= 0.99.2" +NEEDED="xau >= 0.99.2" PKG_CHECK_MODULES(NEEDED, $NEEDED) diff --git a/libxcb.spec b/libxcb.spec index 08416cd..7b255cc 100644 --- a/libxcb.spec +++ b/libxcb.spec @@ -6,8 +6,8 @@ #define bootstrap 1 Name: libxcb -Version: 1.2 -Release: 8%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: A C binding to the X11 protocol Group: System Environment/Libraries @@ -23,8 +23,7 @@ Source1: pthread-stubs.pc.in Source2: http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 Patch0: libxcb-1.1-no-pthread-stubs.patch -Patch1: libxcb-1.2-to-git-6e2e87d.patch -Patch2: libxcb-1.2-no-nagle.patch +Patch1: libxcb-1.3-to-git-e06955.patch BuildRequires: autoconf automake libtool pkgconfig BuildRequires: doxygen @@ -76,7 +75,6 @@ Python bindings for %{name}. %setup -q -b2 %patch0 -p1 -b .pthread-stubs %patch1 -p1 -b .git -%patch2 -p1 -b .no-nagle %if !0%{?bootstrap} pushd ../xpyb-%{xpyb_version} @@ -102,6 +100,8 @@ popd %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT/%{_libdir}/libxcb-xprint.so* +rm -f $RPM_BUILD_ROOT/%{_includedir}/xcb/xprint.h install -m 644 COPYING NEWS README $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version} sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc @@ -121,7 +121,27 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_libdir}/*.so.* +%{_libdir}/libxcb-composite.so.0* +%{_libdir}/libxcb-damage.so.0* +%{_libdir}/libxcb-dpms.so.0* +%{_libdir}/libxcb-glx.so.0* +%{_libdir}/libxcb-randr.so.0* +%{_libdir}/libxcb-record.so.0* +%{_libdir}/libxcb-render.so.0* +%{_libdir}/libxcb-res.so.0* +%{_libdir}/libxcb-screensaver.so.0* +%{_libdir}/libxcb-shape.so.0* +%{_libdir}/libxcb-shm.so.0* +%{_libdir}/libxcb-sync.so.0* +%{_libdir}/libxcb-xevie.so.0* +%{_libdir}/libxcb-xf86dri.so.0* +%{_libdir}/libxcb-xfixes.so.0* +%{_libdir}/libxcb-xinerama.so.0* +%{_libdir}/libxcb-xselinux.so.0* +%{_libdir}/libxcb-xtest.so.0* +%{_libdir}/libxcb-xv.so.0* +%{_libdir}/libxcb-xvmc.so.0* +%{_libdir}/libxcb.so.1* %files devel %defattr(-,root,root,-) @@ -140,6 +160,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 14 2009 Adam Jackson 1.3-1 +- libxcb 1.3 +- List DSO versions explicitly. +- Don't package any xprint bits. Seriously, no. + * Mon Jul 13 2009 Adam Jackson 1.2-8 - Really fix xpyb build. diff --git a/sources b/sources index d377415..6b8db2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ ae32b7846a7d83f5ec542a5431117564 libxcb-1.2.tar.bz2 0d82bbaa97f89e41aada9fab5630147a xpyb-1.1.tar.bz2 +74b18b863df6dd669e1df9854f96c329 libxcb-1.3.tar.bz2