drop python bindings, bad bundling

This commit is contained in:
Adam Jackson 2010-08-26 14:12:05 -04:00
parent 99b83a3c71
commit e291034dc9
2 changed files with 3 additions and 51 deletions

View File

@ -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 Name: libxcb
Version: 1.7 Version: 1.7
Release: 1%{?dist} 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 # 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... # the pkgconfig file so libs that link against libxcb know this...
Source1: pthread-stubs.pc.in Source1: pthread-stubs.pc.in
Source2: http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2
BuildRequires: autoconf automake libtool pkgconfig BuildRequires: autoconf automake libtool pkgconfig
@ -28,13 +20,9 @@ BuildRequires: doxygen
BuildRequires: graphviz BuildRequires: graphviz
BuildRequires: libXau-devel BuildRequires: libXau-devel
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: python-devel
BuildRequires: xcb-proto >= 1.6 BuildRequires: xcb-proto >= 1.6
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-util-macros
%if !0%{?bootstrap}
BuildRequires: libxcb-devel
%endif
%description %description
The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a
@ -59,40 +47,15 @@ BuildArch: noarch
%description doc %description doc
The %{name}-doc package contains documentation for the %{name} library. 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 %prep
%setup -q -b2 %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 %build
autoreconf -v --install autoreconf -v --install
%configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} \ %configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} \
--enable-selinux --enable-selinux
make %{?_smp_mflags} make %{?_smp_mflags}
%if !0%{?bootstrap}
pushd ../xpyb-%{xpyb_version}
autoreconf -v --install
%configure
make %{?_smp_mflags}
popd
%endif
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$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} 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 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 find $RPM_BUILD_ROOT -name '*.la' -delete
%clean %clean
@ -151,13 +108,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/doc/%{name}-%{version} %{_datadir}/doc/%{name}-%{version}
%if !0%{?bootstrap}
%files python
%defattr(-,root,root,-)
%{python_sitearch}/xcb
%endif
%changelog %changelog
* Thu Aug 26 2010 Adam Jackson <ajax@redhat.com> 1.7-2
- Drop python bindings, nothing's using them.
* Mon Aug 16 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7-1 * Mon Aug 16 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7-1
- libxcb 1.7 - libxcb 1.7

View File

@ -1,3 +1 @@
0d82bbaa97f89e41aada9fab5630147a xpyb-1.1.tar.bz2
d19c0ba6ba42ebccd3d62d8bb147b551 libxcb-1.5.tar.bz2
925699df361b99491165ebc12068056b libxcb-1.7.tar.bz2 925699df361b99491165ebc12068056b libxcb-1.7.tar.bz2