Author: arekm Date: Thu Jul 8 16:53:45 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; python2.7 detection
---- Files affected: packages/kde4-kdeedu: kde4-kdeedu.spec (1.64 -> 1.65) , kde4-kdeedu-python.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kde4-kdeedu/kde4-kdeedu.spec diff -u packages/kde4-kdeedu/kde4-kdeedu.spec:1.64 packages/kde4-kdeedu/kde4-kdeedu.spec:1.65 --- packages/kde4-kdeedu/kde4-kdeedu.spec:1.64 Thu Jul 8 12:37:35 2010 +++ packages/kde4-kdeedu/kde4-kdeedu.spec Thu Jul 8 18:53:39 2010 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): K Desktop Environment - edukacja i rozrywka Name: kde4-kdeedu Version: 4.4.5 -Release: 4 +Release: 5 License: GPL Group: X11/Applications/Games Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2 @@ -17,6 +17,7 @@ Patch1: %{name}-R.patch Patch2: %{name}-categories.patch Patch3: %{name}-libcln.patch +Patch4: %{name}-python.patch BuildRequires: Qt3Support-devel >= %{qtver} BuildRequires: QtDesigner-devel >= %{qtver} BuildRequires: QtOpenGL-devel >= %{qtver} @@ -506,6 +507,7 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p1 %build install -d build @@ -997,6 +999,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.65 2010/07/08 16:53:39 arekm +- rel 5; python2.7 detection + Revision 1.64 2010/07/08 10:37:35 arekm - release 4 ================================================================ Index: packages/kde4-kdeedu/kde4-kdeedu-python.patch diff -u /dev/null packages/kde4-kdeedu/kde4-kdeedu-python.patch:1.1 --- /dev/null Thu Jul 8 18:53:45 2010 +++ packages/kde4-kdeedu/kde4-kdeedu-python.patch Thu Jul 8 18:53:39 2010 @@ -0,0 +1,11 @@ +--- kdeedu-4.4.5/cmake/modules/FindBoostPython.cmake~ 2008-11-04 18:12:46.000000000 +0100 ++++ kdeedu-4.4.5/cmake/modules/FindBoostPython.cmake 2010-07-08 18:52:37.584988344 +0200 +@@ -25,7 +25,7 @@ + set(BOOST_PYTHON_LIBS) + + # handy arrays +-set(PYTHON_VERSIONS "python;python2.6;python2.5;python2.4;python2.3;python2.2") ++set(PYTHON_VERSIONS "python;python2.7;python2.6;python2.5;python2.4;python2.3;python2.2") + set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") + set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") + set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdeedu/kde4-kdeedu.spec?r1=1.64&r2=1.65&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
