python3-cairo: Update to 1.23.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/python-cairo/python-cairo.nm b/python-cairo/python-cairo.nm
deleted file mode 100644 (file)
index b10076e..0000000
--- a/python-cairo/python-cairo.nm
+++ /dev/null
@@ -1,47 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = python-cairo
-version    = 1.8.10
-release    = 3
-
-groups     = Development/Tools
-url        = http://cairographics.org/pycairo
-license    = MPLv1.1 or LGPLv2
-summary    = Python bindings for the cairo library.
-
-description
-       Python bindings for the cairo library.
-end
-
-source_dl  =
-sources    = py2cairo-%{version}.tar.gz
-
-build
-       requires
-               cairo-devel
-               pkg-config
-               python-devel
-       end
-
-       DIR_APP = %{DIR_SRC}/pycairo-%{version}
-end
-
-packages
-       package %{name}
-
-       package %{name}-devel
-               template DEVEL
-
-               # The development headers need the cairo headers.
-               requires
-                       cairo-devel
-               end
-       end
-
-       package %{name}-debuginfo
-               template DEBUGINFO
-       end
-end

diff --git a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0 b/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
deleted file mode 100644 (file)
index b8cd856..0000000
--- a/python3-cairo/patches/cairo-waf-use-python-config-as-shell-script.patch0
+++ /dev/null
@@ -1,11 +0,0 @@
---- .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py.orig   2014-05-12 12:36:46.776004776 +0200
-+++ .waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py        2014-05-12 12:36:53.994995779 +0200
-@@ -169,7 +169,7 @@
-               conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
-       includes=[]
-       if conf.env.PYTHON_CONFIG:
--              for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-+              for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
-                       if(incstr.startswith('-I')or incstr.startswith('/I')):
-                               incstr=incstr[2:]
-                       if incstr not in includes:

diff --git a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch b/python3-cairo/patches/pycairo-1.10.0-test-python3.patch
deleted file mode 100644 (file)
index 32e398f..0000000
--- a/python3-cairo/patches/pycairo-1.10.0-test-python3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up pycairo-1.10.0/test/examples_test.py~ pycairo-1.10.0/test/examples_test.py
---- pycairo-1.10.0/test/examples_test.py~      2010-05-29 08:28:35.000000000 +0300
-+++ pycairo-1.10.0/test/examples_test.py       2013-12-20 22:53:07.806217741 +0200
-@@ -14,7 +14,7 @@ def test_snippets():
-   examples/cairo_snippets/snippets/
-   '''
-   def doSnippets(name):
--    retcode = subprocess.call('python %s -s' % name, shell=True)
-+    retcode = subprocess.call('python3 %s -s' % name, shell=True)
-     assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
- 
-   os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',

diff --git a/python3-cairo/python3-cairo.nm b/python3-cairo/python3-cairo.nm
index a360e7ace0d6b3e9758c49b6f6d4aeca6ed0c750..88fa587ea56af34a2aa72bc5ae1855caa771b94e 100644 (file)
--- a/python3-cairo/python3-cairo.nm
+++ b/python3-cairo/python3-cairo.nm
@@ -4,62 +4,35 @@
 ###############################################################################
 
 name       = python3-cairo
-version    = 1.10.0
-release    = 2
+version    = 1.23.0
+release    = 1
+thisapp    = pycairo-%{version}
 
 groups     = Development/Tools
-url        = http://cairographics.org/pycairo
+url        = https://cairographics.org/pycairo
 license    = MPLv1.1 or LGPLv2
-summary    = Python3 bindings for the cairo library.
+summary    = Python3 bindings for the cairo library
 
 description
        Python3 bindings for the cairo library.
 end
 
-thisapp = pycairo-%{version}
-
-source_dl  = http://cairographics.org/releases/
-sources    = %{thisapp}.tar.bz2
+source_dl  = https://github.com/pygobject/pycairo/releases/download/v%{version}/
 
 build
        requires
                cairo-devel
                pkg-config
                python3-devel >= 3.4
-       end
-
-       prepare
-               # Extract source tarball.
-               %{MACRO_EXTRACT_TARBALL}
-
-               # Ensure that ./waf has created the cached unpacked version
-               # of the wafadmin source tree.
-               # This will be created to a subdirectory like
-               #    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-               python3 ./waf --version
-
-               # Apply all patches.
-               %{MACRO_PATCHES}
+               python3-setuptools
        end
 
        build
-               export PYTHON=python3
-               %{python3} ./waf \
-                       --prefix=%{prefix} \
-                       --libdir=%{libdir} \
-                       configure
-
-               %{python3} ./waf build -v
+               %{python3} setup.py build
        end
 
        install
-               # remove executable bits from examples
-               find ./examples/ -type f -print0 | xargs -0 chmod -x
-
-               DESTDIR=%{BUILDROOT} %{python3} ./waf install
-
-               # add executable bit to the .so libraries so we strip the debug info
-               find %{BUILDROOT} -name '*.so' | xargs chmod +x
+               %{python3} setup.py install --skip-build --root="%{BUILDROOT}"
        end
 end