diff --git a/libxcb.spec b/libxcb.spec index 98df3f6..d7e6bd6 100644 --- a/libxcb.spec +++ b/libxcb.spec @@ -1,6 +1,6 @@ Name: libxcb Version: 1.1.91 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A C binding to the X11 protocol Group: System Environment/Libraries @@ -8,6 +8,11 @@ License: MIT URL: http://xcb.freedesktop.org/ Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# This is stolen straight from the pthread-stubs source: +# http://cgit.freedesktop.org/xcb/pthread-stubs/blob/?id=6900598192bacf5fd9a34619b11328f746a5956d +# we don't need the library because glibc has working pthreads, but we need +# the pkgconfig file so libs that link against libxcb know this... +Source1: pthread-stubs.pc.in Patch0: libxcb-1.1-no-pthread-stubs.patch Patch2: libxcb-1.1-sloppy-lock.patch @@ -62,6 +67,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f 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 %clean rm -rf $RPM_BUILD_ROOT @@ -84,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/doc/%{name}-%{version} %changelog +* Sun Oct 19 2008 Adam Jackson 1.1.91-5 +- Add pthread-stubs.pc + * Mon Oct 13 2008 Adam Jackson 1.1.91-4 - libxcb-1.1-abstract-socket.patch: Drop. - libxcb-1.1.91-git.patch: Update to git master. diff --git a/pthread-stubs.pc.in b/pthread-stubs.pc.in new file mode 100644 index 0000000..1b722e9 --- /dev/null +++ b/pthread-stubs.pc.in @@ -0,0 +1,8 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ + +Name: pthread stubs +Description: Stubs missing from libc for standard pthread functions +Version: 0.1 +Libs: