[weechat] Fixed cmake config to accept python27

Paul P Komkoff Jr stingray at fedoraproject.org
Sat Aug 28 16:42:30 UTC 2010


commit 4aabad80dad663e9e6eb538fdf6a05cac4612bfe
Author: Paul P. Komkoff Jr <i at stingr.net>
Date:   Sat Aug 28 17:42:04 2010 +0100

    Fixed cmake config to accept python27

 weechat-python27.patch |   22 ++++++++++++++++++++++
 weechat.spec           |    7 ++++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/weechat-python27.patch b/weechat-python27.patch
new file mode 100644
index 0000000..68cf364
--- /dev/null
+++ b/weechat-python27.patch
@@ -0,0 +1,22 @@
+diff --git a/cmake/FindPython.cmake b/cmake/FindPython.cmake
+index b36785f..85e1df5 100644
+--- a/cmake/FindPython.cmake
++++ b/cmake/FindPython.cmake
+@@ -34,7 +34,7 @@ IF(PYTHON_FOUND)
+ ENDIF(PYTHON_FOUND)
+ 
+ FIND_PROGRAM(PYTHON_EXECUTABLE
+-  NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
++  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+   PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+   )
+ 
+@@ -65,7 +65,7 @@ IF(PYTHON_EXECUTABLE)
+     )
+   
+   FIND_LIBRARY(PYTHON_LIBRARY
+-    NAMES python python2.6 python2.5 python2.4 python2.3 python2.2
++    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
+     PATHS ${PYTHON_POSSIBLE_LIB_PATH}
+     )
+ 
diff --git a/weechat.spec b/weechat.spec
index 4c0d17f..6b096c1 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -1,11 +1,12 @@
 Name:      weechat
 Summary:   Portable, fast, light and extensible IRC client
 Version:   0.3.3
-Release:   1%{?dist}
+Release:   2%{?dist}
 Source:    http://weechat.org/files/src/%{name}-%{version}.tar.bz2
 Patch0:    weechat-cmake-paths.patch
 Patch1:    weechat-cmake-pie.patch
 Patch2:    weechat-enchant.patch
+Patch3:    weechat-python27.patch
 URL:       http://weechat.org
 Group:     Applications/Communications
 License:   GPLv3
@@ -36,6 +37,7 @@ This package contains include files and pc file for weechat.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %cmake .
@@ -70,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat Aug 28 2010 Paul P. Komkoff Jr <i at stingr.net> - 0.3.3-2
+- fixed cmake config to accept python27
+
 * Wed Aug 25 2010 Paul P. Komkoff Jr <i at stingr.net> - 0.3.3-1
 - new upstream version
 


More information about the scm-commits mailing list