rpms/libxcb/devel .cvsignore, 1.6, 1.7 import.log, 1.3, 1.4 libxcb.spec, 1.20, 1.21 sources, 1.6, 1.7

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25323/devel

Modified Files:
	.cvsignore import.log libxcb.spec sources 
Log Message:
libxcb-python subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	18 Feb 2009 16:01:42 -0000	1.6
+++ .cvsignore	19 May 2009 18:29:36 -0000	1.7
@@ -1 +1,2 @@
 libxcb-1.2.tar.bz2
+xpyb-1.1.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	18 Feb 2009 16:01:42 -0000	1.3
+++ import.log	19 May 2009 18:29:36 -0000	1.4
@@ -1,3 +1,4 @@
 libxcb-1_1_91-1_fc10:HEAD:libxcb-1.1.91-1.fc10.src.rpm:1221155742
 libxcb-1_1_93-1_fc11:HEAD:libxcb-1.1.93-1.fc11.src.rpm:1229635191
 libxcb-1_2-1_fc11:HEAD:libxcb-1.2-1.fc11.src.rpm:1234972884
+libxcb-1_2-4_fc12:HEAD:libxcb-1.2-4.fc12.src.rpm:1242757718


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- libxcb.spec	13 Apr 2009 16:03:30 -0000	1.20
+++ libxcb.spec	19 May 2009 18:29:36 -0000	1.21
@@ -1,6 +1,10 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%define xpyb_version 1.1
+
 Name:           libxcb
 Version:        1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -13,6 +17,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 # 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 
 
 Patch0:         libxcb-1.1-no-pthread-stubs.patch
 Patch1:		libxcb-1.2-to-git-6e2e87d.patch
@@ -50,8 +55,16 @@ BuildArch:	noarch
 %description    doc
 The %{name}-doc package contains documentation for the %{name} library.
 
+%package	python
+Summary:	Python bindings for %{name}
+Group:		Development/Libraries
+Provides:	xpyb
+
+%description	python
+Python bindings for %{name}.
+
 %prep
-%setup -q
+%setup -q -b2
 %patch0 -p1 -b .pthread-stubs
 %patch1 -p1 -b .git
 
@@ -61,13 +74,23 @@ autoreconf -v --install
 	   --enable-selinux
 make %{?_smp_mflags}
 
+pushd ../xpyb-%{xpyb_version}
+%configure
+make %{?_smp_mflags}
+popd
+
 %install
 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, at libdir@,%{_libdir},;s, at prefix@,%{_prefix},;s, at exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
 
+pushd ../xpyb-%{xpyb_version}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
+find $RPM_BUILD_ROOT -name '*.la' -delete
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,7 +111,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_datadir}/doc/%{name}-%{version}
 
+%files python
+%defattr(-,root,root,-)
+%{python_sitearch}/xcb
+
 %changelog
+* Tue May 19 2009 Adam Jackson <ajax at redhat.com> 1.2-4
+- Add libxcb-python subpackage
+
 * Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 1.2-3
 - libxcb-1.2-to-git-6e2e87d.patch: Various updates from git, XID generation
   being the most important.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	18 Feb 2009 16:01:42 -0000	1.6
+++ sources	19 May 2009 18:29:36 -0000	1.7
@@ -1 +1,2 @@
 ae32b7846a7d83f5ec542a5431117564  libxcb-1.2.tar.bz2
+0d82bbaa97f89e41aada9fab5630147a  xpyb-1.1.tar.bz2