From 54563c2a9cf7eaf94fc392d69ab79167d41301c0 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Dec 17 2008 16:54:44 +0000 Subject: xcb-proto 1.3 --- diff --git a/.cvsignore b/.cvsignore index 5dcbd97..0a6d02e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xcb-proto-1.2.tar.bz2 +xcb-proto-1.3.tar.bz2 diff --git a/import.log b/import.log index 91d654c..34a4199 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ xcb-proto-1_2-1_fc10:HEAD:xcb-proto-1.2-1.fc10.src.rpm:1221082638 +xcb-proto-1_3-1_fc11:HEAD:xcb-proto-1.3-1.fc11.src.rpm:1229532864 diff --git a/sources b/sources index 9f55240..47729f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09f912486d8a2353bb4b99ddc28ba3c7 xcb-proto-1.2.tar.bz2 +d9275a714e83ab9c1f9b260c6eff1609 xcb-proto-1.3.tar.bz2 diff --git a/xcb-proto-1.2-selinux.patch b/xcb-proto-1.2-selinux.patch deleted file mode 100644 index e19bd59..0000000 --- a/xcb-proto-1.2-selinux.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 91b5a1b56c744c2aa2740eb814d39ec48cbd27af -Author: Eamon Walsh -Date: Tue Sep 2 17:38:30 2008 -0400 - - xcb-xselinux: Add GetClientContext request. - -diff --git a/src/xselinux.xml b/src/xselinux.xml -index 30a8a27..7751470 100644 ---- a/src/xselinux.xml -+++ b/src/xselinux.xml -@@ -261,4 +261,16 @@ authorization from the authors. - - - -+ -+ -+ -+ -+ -+ -+ -+ context_len -+ -+ -+ -+ - diff --git a/xcb-proto.spec b/xcb-proto.spec index 5c0ed2b..d39b7b6 100644 --- a/xcb-proto.spec +++ b/xcb-proto.spec @@ -1,9 +1,9 @@ %define debug_package %{nil} -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} Name: xcb-proto -Version: 1.2 -Release: 3%{?dist} +Version: 1.3 +Release: 1%{?dist} Summary: XCB protocol descriptions Group: Development/Libraries @@ -16,8 +16,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python Requires: pkgconfig -Patch0: xcb-proto-1.2-selinux.patch - %description XCB is a project to enable efficient language bindings to the X11 protocol. This package contains the protocol descriptions themselves. Language @@ -26,10 +24,9 @@ the protocol. %prep %setup -q -%patch0 -p1 -b .selinux %build -# Bit of a hack to get the pc file in /usr/share, no we can be noarch. +# Bit of a hack to get the pc file in /usr/share, so we can be noarch. %configure --libdir=%{_datadir} make %{?_smp_mflags} @@ -47,9 +44,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/xcb/ %{_datadir}/xcb/*.xsd %{_datadir}/xcb/*.xml -%{python_sitearch}/xcbgen +%{python_sitelib}/xcbgen %changelog +* Wed Dec 17 2008 Adam Jackson 1.3-1 +- xcb-proto 1.3 + * Sat Nov 29 2008 Ignacio Vazquez-Abrams - 1.2-3 - Rebuild for Python 2.6