commit ce97d5b05efc446fda77b2d627c05112c7003d7e Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Oct 25 11:40:59 2014 +0200
- added python patch, adjusted options for cmake 3 - fixed typos in cmake options libsolv-python.patch | 13 +++++++++++++ libsolv.spec | 14 +++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) --- diff --git a/libsolv.spec b/libsolv.spec index e4bc230..ee4aa7c 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -16,6 +16,7 @@ Group: Libraries Source0: https://github.com/openSUSE/libsolv/archive/%{version}.tar.gz?/%{name}-%{version}.tgz # Source0-md5: 17e2fada982e6629b679785b4b6ff3b3 Patch0: ruby.patch +Patch1: %{name}-python.patch URL: https://github.com/openSUSE/libsolv BuildRequires: bzip2-devel BuildRequires: cmake >= 2.4 @@ -156,17 +157,18 @@ Wiązania języka Ruby do bibliotek libsolv. %prep %setup -q %patch0 -p1 +%patch1 -p1 # use system one -rm cmake/modules/FindRuby.cmake +%{__rm} cmake/modules/FindRuby.cmake %build install -d build %{?with_python3:build-py3} cd build %cmake .. \ -DENABLE_APPDATA=ON \ - -DENABLE_BZIP2_COMPRESSON=ON \ - -DENABLE_LZMA_COMPRESSON=ON \ + -DENABLE_BZIP2_COMPRESSION=ON \ + -DENABLE_LZMA_COMPRESSION=ON \ -DENABLE_PERL=ON \ -DENABLE_PUBKEY=ON \ -DENABLE_PYTHON=ON \ @@ -176,6 +178,7 @@ cd build %{?with_ruby:-DENABLE_RUBY=ON} \ %{?with_static_libs:-DENABLE_STATIC=ON} \ -DPythonLibs_FIND_VERSION=2 \ + -DPythonLibs_FIND_VERSION_MAJOR=2 \ -DRPM5=ON \ -DUSE_VENDORDIRS=ON @@ -184,14 +187,15 @@ cd build cd ../build-py3 %cmake .. \ -DENABLE_APPDATA=ON \ - -DENABLE_BZIP2_COMPRESSON=ON \ - -DENABLE_LZMA_COMPRESSON=ON \ + -DENABLE_BZIP2_COMPRESSION=ON \ + -DENABLE_LZMA_COMPRESSION=ON \ -DENABLE_PUBKEY=ON \ -DENABLE_PYTHON=ON \ -DENABLE_RPMDB=ON \ -DENABLE_RPMMD=ON \ -DENABLE_RPMDB_BYRPMHEADER=ON \ -DPythonLibs_FIND_VERSION=3 \ + -DPythonLibs_FIND_VERSION_MAJOR=3 \ -DRPM5=ON %{__make} diff --git a/libsolv-python.patch b/libsolv-python.patch new file mode 100644 index 0000000..8c313c6 --- /dev/null +++ b/libsolv-python.patch @@ -0,0 +1,13 @@ +--- libsolv-0.6.6/bindings/python/CMakeLists.txt.orig 2014-10-07 14:41:37.000000000 +0200 ++++ libsolv-0.6.6/bindings/python/CMakeLists.txt 2014-10-25 10:42:06.870708523 +0200 +@@ -1,8 +1,8 @@ + #SET (PythonLibs_FIND_VERSION 3) + + FIND_PACKAGE (PythonLibs) +-SET (PythonInterp_FIND_VERSION ${PYTHONLIBS_VERSION_STRING}) +-FIND_PACKAGE (PythonInterp REQUIRED) ++#SET (PythonInterp_FIND_VERSION ${PYTHONLIBS_VERSION_STRING}) ++FIND_PACKAGE (PythonInterp ${PYTHONLIBS_VERSION_STRING} REQUIRED) + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) + + IF (NOT DEFINED PYTHON_VERSION_MAJOR) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libsolv.git/commitdiff/ce97d5b05efc446fda77b2d627c05112c7003d7e _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit