From 3ceb9faa1ace0ea0488cba6ca41bbd7441b3abe6 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Wed, 31 Oct 2018 11:17:10 +0900 Subject: [PATCH] Imported Upstream version 1.15.2 --- NEWS | 11 +++++++++++ PKG-INFO | 2 +- setup.py | 7 ++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 9f33577..aad9f39 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,17 @@ Since version 1.11.0 Pycairo uses `Semantic Versioning `__ i.e. the newest version is the latest stable one. +.. _v1.15.2: + +1.15.2 - 2017-09-03 +------------------- + +Fixes: + * setup.py: Install pkgconfig file to the same library prefix that Python + uses. (/usr/lib64 instead of /usr/lib under Fedora for example) :bug:`70` + :pr:`71` (:user:`Sander Sweers `) + + .. _v1.15.1: 1.15.1 - 2017-08-19 diff --git a/PKG-INFO b/PKG-INFO index ccde036..0f3dcdb 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pycairo -Version: 1.15.1 +Version: 1.15.2 Summary: Python interface for cairo Home-page: https://pycairo.readthedocs.io Author: Christoph Reiter diff --git a/setup.py b/setup.py index 190c3be..4a2e822 100755 --- a/setup.py +++ b/setup.py @@ -6,9 +6,10 @@ import sys import os import errno from distutils.core import Extension, setup, Command, Distribution +from distutils import sysconfig -PYCAIRO_VERSION = '1.15.1' +PYCAIRO_VERSION = '1.15.2' CAIRO_VERSION_REQUIRED = '1.13.1' XPYB_VERSION_REQUIRED = '1.3' @@ -119,8 +120,8 @@ class install_pkgconfig(Command): return [] def run(self): - libdir = os.path.join(self.install_data, "lib") - install_dir = os.path.join(libdir, "pkgconfig") + python_lib = sysconfig.get_python_lib(True, True, self.install_data) + install_dir = os.path.join(os.path.dirname(python_lib), 'pkgconfig') self.mkpath(install_dir) if sys.version_info[0] == 3: -- 2.7.4