diff --git a/libxcb.spec b/libxcb.spec index 3aad71d..e839c01 100644 --- a/libxcb.spec +++ b/libxcb.spec @@ -1,10 +1,3 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} - -%define xpyb_version 1.1 - -# Define this when bootstrapping to avoid the xpyb loop -#define bootstrap 1 - Name: libxcb Version: 1.7 Release: 1%{?dist} @@ -20,7 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # 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 -Source2: http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2 BuildRequires: autoconf automake libtool pkgconfig @@ -28,13 +20,9 @@ BuildRequires: doxygen BuildRequires: graphviz BuildRequires: libXau-devel BuildRequires: libxslt -BuildRequires: python-devel BuildRequires: xcb-proto >= 1.6 BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-util-macros -%if !0%{?bootstrap} -BuildRequires: libxcb-devel -%endif %description The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a @@ -59,40 +47,15 @@ BuildArch: noarch %description doc The %{name}-doc package contains documentation for the %{name} library. -%if !0%{?bootstrap} -%package python -Summary: Python bindings for %{name} -Group: Development/Libraries -Provides: xpyb - -%description python -Python bindings for %{name}. -%endif - %prep %setup -q -b2 -%if !0%{?bootstrap} -pushd ../xpyb-%{xpyb_version} -# XXX fix me upstream please -sed -i 's@$(pythondir)@$(pyexecdir)@' src/Makefile.am -popd -%endif - %build autoreconf -v --install %configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} \ --enable-selinux make %{?_smp_mflags} -%if !0%{?bootstrap} -pushd ../xpyb-%{xpyb_version} -autoreconf -v --install -%configure -make %{?_smp_mflags} -popd -%endif - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -101,12 +64,6 @@ 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 -%if !0%{?bootstrap} -pushd ../xpyb-%{xpyb_version} -make install DESTDIR=$RPM_BUILD_ROOT -popd -%endif - find $RPM_BUILD_ROOT -name '*.la' -delete %clean @@ -151,13 +108,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_datadir}/doc/%{name}-%{version} -%if !0%{?bootstrap} -%files python -%defattr(-,root,root,-) -%{python_sitearch}/xcb -%endif - %changelog +* Thu Aug 26 2010 Adam Jackson 1.7-2 +- Drop python bindings, nothing's using them. + * Mon Aug 16 2010 Peter Hutterer 1.7-1 - libxcb 1.7 diff --git a/sources b/sources index a7bba7a..dda4b50 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -0d82bbaa97f89e41aada9fab5630147a xpyb-1.1.tar.bz2 -d19c0ba6ba42ebccd3d62d8bb147b551 libxcb-1.5.tar.bz2 925699df361b99491165ebc12068056b libxcb-1.7.tar.bz2