Author: glen Date: Sat Jul 17 19:57:52 2010 GMT Module: packages Tag: HEAD ---- Log message: - recognize python 2.7 in FIND_PACKAGE(PythonLibs); rel 2
---- Files affected: packages/cmake: cmake.spec (1.49 -> 1.50) , python-2.7.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/cmake/cmake.spec diff -u packages/cmake/cmake.spec:1.49 packages/cmake/cmake.spec:1.50 --- packages/cmake/cmake.spec:1.49 Tue Jun 29 23:41:04 2010 +++ packages/cmake/cmake.spec Sat Jul 17 21:57:46 2010 @@ -8,18 +8,19 @@ # Conditional build: %bcond_with bootstrap # use internal versions of some libraries %bcond_without gui # don't build gui package -# + Summary: Cross-platform, open-source make system Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach Name: cmake Version: 2.8.2 -Release: 1 +Release: 2 License: BSD Group: Development/Building Source0: http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz # Source0-md5: 8c967d5264657a798f22ee23976ff0d9 Patch0: %{name}-lib64.patch Patch1: %{name}-tinfo.patch +Patch2: python-2.7.patch URL: http://www.cmake.org/ %{?with_gui:BuildRequires: QtGui-devel} BuildRequires: libstdc++-devel @@ -67,6 +68,7 @@ %patch0 -p1 %endif %patch1 -p0 +%patch2 -p1 cat > "init.cmake" <<EOF SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE) @@ -92,11 +94,10 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/cmake - %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT%{_prefix}/doc +rm -r $RPM_BUILD_ROOT%{_prefix}/doc %clean rm -rf $RPM_BUILD_ROOT @@ -127,6 +128,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.50 2010/07/17 19:57:46 glen +- recognize python 2.7 in FIND_PACKAGE(PythonLibs); rel 2 + Revision 1.49 2010/06/29 21:41:04 draenog - up to 2.8.2 - add libtinfo to libraries for ccmake ================================================================ Index: packages/cmake/python-2.7.patch diff -u /dev/null packages/cmake/python-2.7.patch:1.1 --- /dev/null Sat Jul 17 21:57:52 2010 +++ packages/cmake/python-2.7.patch Sat Jul 17 21:57:46 2010 @@ -0,0 +1,11 @@ +--- cmake-2.8.2/Modules/FindPythonLibs.cmake~ 2010-06-28 18:15:57.000000000 +0300 ++++ cmake-2.8.2/Modules/FindPythonLibs.cmake 2010-07-17 22:49:14.936169397 +0300 +@@ -27,7 +27,7 @@ + # Search for the python framework on Apple. + CMAKE_FIND_FRAMEWORKS(Python) + +-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) + STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) + IF(WIN32) + FIND_LIBRARY(PYTHON_DEBUG_LIBRARY ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cmake/cmake.spec?r1=1.49&r2=1.50&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
