fix python install dir and sphinx-build path

Release: 6

diff --git a/libcomps.spec b/libcomps.spec
index b2a52a8b6eefd484b56f80462e39cc942fda9b33..96644d06a145b7fb606a47b1c8755b4149ee72e2 100644 (file)
--- a/libcomps.spec
+++ b/libcomps.spec
@@ -12,24 +12,30 @@ Summary:    Comps XML file manipulation library
 Summary(pl.UTF-8):     Biblioteka operacji na plikach Comps XML
 Name:          libcomps
 Version:       0.1.6
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         Libraries
 Source0:       https://github.com/midnightercz/libcomps/archive/%{name}-%{version}.tar.gz
 # Source0-md5: 50611b9564f15b6a06e0f40f7683a0f0
 Patch0:                %{name}-link.patch
+Patch1:                python-install-dir.patch
 URL:           https://github.com/midnightercz/libcomps/
 BuildRequires: check-devel
 BuildRequires: cmake >= 2.6
 %{?with_doc:BuildRequires:     doxygen}
 BuildRequires: expat-devel >= 1.95
 BuildRequires: libxml2-devel >= 2.0
-%{?with_python2:BuildRequires: python-devel}
-%{?with_python2:BuildRequires: python-modules}
-%{?with_python3:BuildRequires: python3-devel}
-%{?with_python3:BuildRequires: python3-modules}
-BuildRequires: rpm-pythonprov
+%if %{with python2}
+BuildRequires: python-devel
+BuildRequires: python-modules
+%{?with_doc:BuildRequires:     sphinx-pdg-2}
+%endif
+%if %{with python3}
+BuildRequires: python3-devel
+BuildRequires: python3-modules
 %{?with_doc:BuildRequires:     sphinx-pdg}
+%endif
+BuildRequires: rpm-pythonprov
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -83,12 +89,15 @@ Wiązania Pythona 3.x do biblioteki libcomps.
 %prep
 %setup -qn %{name}-%{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
 cd build
 %cmake ../libcomps \
        -DPYTHON_DESIRED:STRING=2 \
+       -DPYTHON_INSTALL_DIR="%{py_sitedir}" \
+       -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build-2 \
        -DCMAKE_CXX_COMPILER_WORKS=1 \
        -DCMAKE_CXX_COMPILER="%{__cc}"
 
@@ -102,10 +111,13 @@ install -d build-py3
 cd build-py3
 %cmake ../libcomps \
        -DPYTHON_DESIRED:STRING=3 \
+       -DPYTHON_INSTALL_DIR="%{py3_sitedir}" \
+       -DSPHINX_EXECUTABLE=/usr/bin/sphinx-build-3 \
        -DCMAKE_CXX_COMPILER_WORKS=1 \
        -DCMAKE_CXX_COMPILER="%{__cc}"
 
 %{__make}
+%{__make} pydocs
 cd ..
 %endif
 
@@ -159,16 +171,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libcomps
 %{_pkgconfigdir}/libcomps.pc
 
+%if %{with python2}
 %files -n python-libcomps
 %defattr(644,root,root,755)
 %doc build/src/python/docs/html/{*.html,*.js,_images,_static}
 %dir %{py_sitedir}/libcomps
 %{py_sitedir}/libcomps/__init__.py[co]
 %attr(755,root,root) %{py_sitedir}/libcomps/_libpycomps.so
+%endif
 
 %if %{with python3}
 %files -n python3-libcomps
-%doc build/src/python/docs/html/{*.html,*.js,_images,_static}
+%doc build-py3/src/python/docs/html/{*.html,*.js,_images,_static}
 %defattr(644,root,root,755)
 %dir %{py3_sitedir}/libcomps
 %{py3_sitedir}/libcomps/__init__.py

diff --git a/python-install-dir.patch b/python-install-dir.patch
new file mode 100644 (file)
index 0000000..449844c
--- /dev/null
+++ b/python-install-dir.patch
@@ -0,0 +1,22 @@
+diff -dur -x '*~' libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python2/CMakeLists.txt libcomps-libcomps-0.1.6/libcomps/src/python/src/python2/CMakeLists.txt
+--- libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python2/CMakeLists.txt        2014-01-29 12:10:07.000000000 +0100
++++ libcomps-libcomps-0.1.6/libcomps/src/python/src/python2/CMakeLists.txt     2015-11-30 18:24:47.545310413 +0100
+@@ -1,7 +1,6 @@
+ find_package (PythonLibs 2.7)
+ find_package (PythonInterp 2.7 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)
+ 
+ include_directories(${PYTHON_INCLUDE_PATH})
+ include_directories(${LIBCOMPS_INCLUDE_PATH})
+diff -dur -x '*~' libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python3/CMakeLists.txt libcomps-libcomps-0.1.6/libcomps/src/python/src/python3/CMakeLists.txt
+--- libcomps-libcomps-0.1.6.orig/libcomps/src/python/src/python3/CMakeLists.txt        2014-01-29 12:10:07.000000000 +0100
++++ libcomps-libcomps-0.1.6/libcomps/src/python/src/python3/CMakeLists.txt     2015-11-30 18:24:37.748571365 +0100
+@@ -1,7 +1,6 @@
+ find_package (PythonLibs 3.0)
+ find_package (PythonInterp 3.0)
+ 
+-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)
+ 
+ include_directories(${PYTHON_INCLUDE_PATH})
+ include_directories(${LIBCOMPS_INCLUDE_PATH})