[shiboken] Added patch to fix pkgconfig file generation

Kalev Lember kalev at fedoraproject.org
Sat Sep 11 12:48:12 UTC 2010


commit 355478e4bca6f9a24c59768c0f2d37fef667019c
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Sat Sep 11 15:45:44 2010 +0300

    Added patch to fix pkgconfig file generation

 0001-Fix-up-shiboken.pc-file-generation.patch |   28 +++++++++++++++++++++++++
 shiboken.spec                                 |    7 +++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-up-shiboken.pc-file-generation.patch b/0001-Fix-up-shiboken.pc-file-generation.patch
new file mode 100644
index 0000000..1d742df
--- /dev/null
+++ b/0001-Fix-up-shiboken.pc-file-generation.patch
@@ -0,0 +1,28 @@
+From 07b4e71aed9a8fe2b5e4339b42b7952b7d6a5e61 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalev at smartlink.ee>
+Date: Sat, 11 Sep 2010 15:21:58 +0300
+Subject: [PATCH] Fix up shiboken.pc file generation
+
+Use @var@ syntax instead of ${var} in shiboken.pc.in; configure_file is
+called with @ONLY option in CMakeLists.txt, which means that ${var}
+doesn't get replaced.
+---
+ data/shiboken.pc.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in
+index ed1cc6c..c54e84a 100644
+--- a/data/shiboken.pc.in
++++ b/data/shiboken.pc.in
+@@ -7,6 +7,6 @@ generator_location=@CMAKE_INSTALL_PREFIX@/bin/shiboken
+ Name: shiboken
+ Description: Support library for Python bindings created with Shiboken generator.
+ Version: @shiboken_VERSION@
+-Libs: -L${libdir} -lpython -lshiboken${shiboken_SUFFIX}
+-Cflags: -I${includedir}/shiboken${shiboken_SUFFIX}
++Libs: -L${libdir} -lpython -lshiboken at shiboken_SUFFIX@
++Cflags: -I${includedir}/shiboken at shiboken_SUFFIX@
+ 
+-- 
+1.7.2.2
+
diff --git a/shiboken.spec b/shiboken.spec
index 2890eb1..ff5f7ee 100644
--- a/shiboken.spec
+++ b/shiboken.spec
@@ -1,12 +1,13 @@
 Name:           shiboken
 Version:        0.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CPython bindings generator for C++ libraries
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.pyside.org
 Source0:        http://www.pyside.org/files/shiboken-%{version}.tar.bz2
+Patch0:         0001-Fix-up-shiboken.pc-file-generation.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  apiextractor-devel
@@ -60,6 +61,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Build against sparsehash package
 rm -rf ext/sparsehash/
@@ -118,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 11 2010 Kalev Lember <kalev at smartlink.ee> - 0.5.0-2
+- Added patch to fix pkgconfig file generation
+
 * Sat Sep 11 2010 Kalev Lember <kalev at smartlink.ee> - 0.5.0-1
 - Update to 0.5.0
 - Dropped upstreamed patches


More information about the scm-commits mailing list