Update to last successful build

d97c6b36e0daad42d5c85d267dcd43b6addf71bd Remove too much trickery

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libsolv?expand=0&rev=749

libsolv-0.6.23.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f907ac11b0e2ad2cc1415f1aae4b7feb799a7268112e534fc3de47996b97301
-size 469011
+oid sha256:28942dad5cfef5a9bfe609313edc351da99cd157dcdbe39287e65298f6d754b4
+size 468678

libsolv.spec

@@ -178,7 +178,6 @@ export CFLAGS="$RPM_OPT_FLAGS"
 export CXXFLAGS="$CFLAGS"
 
 CMAKE_FLAGS=
-PYTHON_CMAKE_FLAGS=
 %if 0%{?fedora_version} || 0%{?rhel_version} >= 600 || 0%{?centos_version} >= 600
 CMAKE_FLAGS="-DFEDORA=1"
 %endif
@@ -187,12 +186,11 @@ CMAKE_FLAGS="-DSUSE=1 -DENABLE_APPDATA=1 -DENABLE_COMPS=1"
 %endif
 
 %if %{with python3_binding}
-for pyversion in 3 2 ; do
-test $pyversion == 2 && perl -i -p -e 's/(python)/${1}3/i' CMakeCache.txt
-PYTHON_CMAKE_FLAGS="-DPythonLibs_FIND_VERSION=$pyversion -DPythonLibs_FIND_VERSION_MAJOR=$pyversion"
+# build both for python2 and python3
+CMAKE_FLAGS="$CMAKE_FLAGS -DPythonLibs_FIND_VERSION=2 -DPythonLibs_FIND_VERSION_MAJOR=2 -DENABLE_PYTHON3=1 -DPYTHON3_EXECUTABLE=/usr/bin/python3 -DPYTHON3_INCLUDE_DIR=$(/usr/bin/python3-config --includes | sed -e 's/ .*//' -e 's/-I//')"
 %endif
 
-cmake	$CMAKE_FLAGS $PYTHON_CMAKE_FLAGS \
+cmake	$CMAKE_FLAGS \
 	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DLIB=%{_lib} \
 	-DCMAKE_VERBOSE_MAKEFILE=TRUE \
@@ -205,11 +203,6 @@ cmake	$CMAKE_FLAGS $PYTHON_CMAKE_FLAGS \
 	%{?with_zypp:-DENABLE_SUSEREPO=1 -DENABLE_HELIXREPO=1} \
 	-DUSE_VENDORDIRS=1 \
 	-DCMAKE_SKIP_RPATH=1
-
-%if %{with python3_binding}
-done
-%endif
-
 make %{?jobs:-j %jobs}
 
 %install