- updated to 1.3.1

Changed files:
    python-xpyb-dir.patch -> 1.3
    python-xpyb.spec -> 1.7

diff --git a/python-xpyb-dir.patch b/python-xpyb-dir.patch
index f4b0e5c966d0a915c2527e4c93a60da74e4543f0..43032feba6683f7a122d6641417f1cac867fd328 100644 (file)
--- a/python-xpyb-dir.patch
+++ b/python-xpyb-dir.patch
@@ -1,12 +1,12 @@
---- xpyb-1.2/src/Makefile.am.orig      2009-12-17 19:46:14.000000000 +0100
-+++ xpyb-1.2/src/Makefile.am   2010-07-02 23:30:35.605386711 +0200
+--- xpyb-1.3.1/src/Makefile.am.orig    2012-03-22 21:23:13.000000000 +0100
++++ xpyb-1.3.1/src/Makefile.am 2012-03-24 07:00:28.456669760 +0100
 @@ -11,8 +11,8 @@
  
  xcb_la_LIBADD = $(LIBXCB_LIBS)
  xcb_la_CPPFLAGS = -I$(PYTHON_INCLUDE)
--xcb_la_CFLAGS = -g $(CWARNFLAGS)
+-xcb_la_CFLAGS = -g $(CWARNFLAGS) $(LIBXCB_CFLAGS)
 -xcb_la_LDFLAGS = -module
-+xcb_la_CFLAGS = $(CWARNFLAGS)
++xcb_la_CFLAGS = $(CWARNFLAGS) $(LIBXCB_CFLAGS)
 +xcb_la_LDFLAGS = -module -avoid-version
  xcb_la_SOURCES = conn.c constant.c cookie.c error.c event.c except.c \
                 ext.c extkey.c iter.c list.c module.c protobj.c \

diff --git a/python-xpyb.spec b/python-xpyb.spec
index f2c1ad4c968defce94b0677b50df7094c3e3b234..f60b01c3c7f1ec4e37285f14e42a1d9bd5bcf013 100644 (file)
--- a/python-xpyb.spec
+++ b/python-xpyb.spec
@@ -1,23 +1,23 @@
 Summary:       X-protocol Python Binding
 Summary(pl.UTF-8):     X-protocol Python Binding - wiązanie Pythona do protokołu X
 Name:          python-xpyb
-Version:       1.2
-Release:       2
+Version:       1.3.1
+Release:       1
 License:       Public Domain
 Group:         Development/Languages/Python
 Source0:       http://xcb.freedesktop.org/dist/xpyb-%{version}.tar.bz2
-# Source0-md5: 953cd851d7ad3e59577062ca53c77f3d
+# Source0-md5: b9b70746cd348836516edcba96d24677
 Patch0:                %{name}-dir.patch
 URL:           http://xcb.freedesktop.org/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: libtool
-BuildRequires: libxcb-devel >= 1.1
+BuildRequires: libxcb-devel >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: rpm-pythonprov
-BuildRequires: xcb-proto >= 1.1
+BuildRequires: xcb-proto >= 1.7.1
 %pyrequires_eq  python-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,6 +29,20 @@ libxcb.
 XPyB udostępnia wiązanie Pythona do protokołu X Window System poprzez
 libxcb.
 
+%package devel
+Summary:       Development files for X Python Binding package
+Summary(pl.UTF-8):     Pliki programistyczne pakietu X Python Binding
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      libxcb-devel >= 1.5
+Requires:      python-devel >= 1:2.5
+
+%description devel
+Development files for X Python Binding package.
+
+%description devel -l pl.UTF-8
+Pliki programistyczne pakietu X Python Binding.
+
 %prep
 %setup -q -n xpyb-%{version}
 %patch0 -p1
@@ -50,7 +64,9 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 %py_postclean
-rm $RPM_BUILD_ROOT%{py_sitedir}/xcb/*.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/xcb/*.la
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xpyb
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,5 +77,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/xcb
 %attr(755,root,root) %{py_sitedir}/xcb/xcb.so
 %{py_sitedir}/xcb/*.py[co]
-# -devel
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/xpyb.h
 %{_pkgconfigdir}/xpyb.pc