rpms/kdebindings/F-9 kdebindings-4.1.0-kde#167450.patch,1.1,1.2

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Sat Jul 26 00:05:14 UTC 2008


Author: kkofler

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

Modified Files:
	kdebindings-4.1.0-kde#167450.patch 
Log Message:
Fix patch for CMake 2.4.

kdebindings-4.1.0-kde#167450.patch:

Index: kdebindings-4.1.0-kde#167450.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-9/kdebindings-4.1.0-kde#167450.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebindings-4.1.0-kde#167450.patch	25 Jul 2008 23:15:59 -0000	1.1
+++ kdebindings-4.1.0-kde#167450.patch	26 Jul 2008 00:04:43 -0000	1.2
@@ -1,12 +1,16 @@
 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 @@
++++ kdebindings-4.1.0-kde#167450/python/pykde4/CMakeLists.txt	2008-07-26 02:04:05.000000000 +0200
+@@ -3,6 +3,13 @@
  # 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)
++IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
++    SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/pykde)
++ELSE(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
++    SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde)
++ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
 +
  FIND_PACKAGE(PythonLibrary REQUIRED)
  INCLUDE(PythonMacros)




More information about the fedora-extras-commits mailing list