rpms/kdebindings/F-9 kdebindings-4.1.0-kde#167450.patch, NONE, 1.1 kdebindings.spec, 1.102, 1.103

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20823/F-9

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.1.0-kde#167450.patch 
Log Message:
Sync from devel:
* Fri Jul 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-4
- fix Python and Ruby bindings overwriting each other (#456722, kde#167450)

kdebindings-4.1.0-kde#167450.patch:

--- NEW FILE kdebindings-4.1.0-kde#167450.patch ---
diff -ur kdebindings-4.1.0/python/pykde4/CMakeLists.txt kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt
--- kdebindings-4.1.0/python/pykde4/CMakeLists.txt	2008-07-17 23:32:45.000000000 +0200
+++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt	2008-07-26 01:10:21.000000000 +0200
@@ -3,6 +3,9 @@
 # This module can be built independant from the rest of kdebindings.
 SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
+# Fix output file conflict with the Ruby bindings
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
+
 FIND_PACKAGE(PythonLibrary REQUIRED)
 INCLUDE(PythonMacros)
 


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- kdebindings.spec	25 Jul 2008 18:39:47 -0000	1.102
+++ kdebindings.spec	25 Jul 2008 23:15:59 -0000	1.103
@@ -22,13 +22,16 @@
 
 Name: kdebindings
 Version: 4.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# fix Python and Ruby bindings overwriting each other (#456722, kde#167450)
+# (thanks to Sebastian Sauer)
+Patch0: kdebindings-4.1.0-kde#167450.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kde-filesystem >= 4
@@ -86,6 +89,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .kde#167450
 
 %build
 mkdir -p %{_target_platform}
@@ -164,6 +168,9 @@
 
 
 %changelog
+* Fri Jul 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-4
+- fix Python and Ruby bindings overwriting each other (#456722, kde#167450)
+
 * Fri Jul 25 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-3
 - drop unneeded BR kdegraphics4-devel (Ruby Okular bindings disabled by default)
 - add BR kdepimlibs-devel for Python Akonadi bindings