[python3-cairo/f16] update to upstream 1.10.0
John Palmieri (J5)
johnp at fedoraproject.org
Mon Aug 22 13:08:55 UTC 2011
commit 3f96a2e8bc4b3a3045568591b617c8116373c8a8
Author: John (J5) Palmieri <johnp at redhat.com>
Date: Thu Aug 18 15:32:04 2011 -0400
update to upstream 1.10.0
.gitignore | 1 +
0001-Add-support-for-libdir.patch | 87 --------------------
...le-API-instead-of-the-deprecated-PyCObjec.patch | 40 ---------
pycairo-1.8.10-pypath.patch | 36 --------
python3-cairo.spec | 29 ++-----
sources | 2 +-
6 files changed, 10 insertions(+), 185 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ebdb0cf..5babf54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/pycairo-1.8.10.tar.bz2
+/pycairo-1.10.0.tar.bz2
diff --git a/python3-cairo.spec b/python3-cairo.spec
index ec7aa4a..c6a5f6c 100644
--- a/python3-cairo.spec
+++ b/python3-cairo.spec
@@ -1,10 +1,10 @@
-%define cairo_version 1.8.10
+%define cairo_version 1.10.2
### Abstract ###
Name: python3-cairo
-Version: 1.8.10
-Release: 12%{?dist}
+Version: 1.10.0
+Release: 1%{?dist}
License: MPLv1.1 or LGPLv2
Group: Development/Languages
Summary: Python 3 bindings for the cairo library
@@ -12,16 +12,6 @@ URL: http://cairographics.org/pycairo
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Source: http://cairographics.org/releases/pycairo-%{version}.tar.bz2
-Patch0: 0001-Add-support-for-libdir.patch
-Patch1: 0001-use-PyCapsule-API-instead-of-the-deprecated-PyCObjec.patch
-
-# Patch to the embedded copy of waf to fix compiling against python 3.2
-# (due to PEP-3149), by using the appropriate python-config tool, rather
-# than trying to find the libraries by directly using PYTHON_VERSION
-#
-# Not yet sent upstream
-Patch3: pycairo-1.8.10-pypath.patch
-
### Build Dependencies ###
BuildRequires: cairo-devel >= %{cairo_version}
@@ -45,8 +35,6 @@ libraries so that they interoperate with python3-cairo.
%prep
%setup -q -n pycairo-%{version}
-%patch0 -p1 -b .add_libdir
-%patch1 -p1 -b .use_pycapsule
# Ensure that ./waf has created the cached unpacked version
# of the wafadmin source tree.
@@ -54,16 +42,12 @@ libraries so that they interoperate with python3-cairo.
# .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
python3 ./waf --version
-# Patch the unpacked version of waf:
-pushd .waf3*
-%patch3 -p0 -b .pypath
-popd
-
%build
# FIXME: we should be using the system version of waf (e.g. %{_bindir}/waf)
# however it is not yet python 3 compatible but should be when 1.6.0
# is released - https://bugzilla.redhat.com/show_bug.cgi?id=637935
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="$RPM_OPT_FLAGS"
+export PYTHON=python3
python3 ./waf --prefix=%{_usr} \
--libdir=%{_libdir} \
configure
@@ -99,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/py3cairo.pc
%changelog
+* Thu Aug 18 2011 John (J5) Palmieri <johnp at redhat.com> - 1.10.0-1
+- update to upstream 1.10.0
+
* Thu Feb 10 2011 John (J5) Palmieri <johnp at redhat.com> - 1.8.10-12
- remove cairo_rectangle_int_t patch as it was rejected upstream and is
no longer needed
diff --git a/sources b/sources
index 0f31da9..f133ef3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ddc544943d791e3c22ca8f019e10e1e3 pycairo-1.8.10.tar.bz2
+e6fd3f2f1e6a72e0db0868c4985669c5 pycairo-1.10.0.tar.bz2
More information about the scm-commits
mailing list