diff --git a/pykde4-4.13.97-cmake_source_dir.patch b/pykde4-4.13.97-cmake_source_dir.patch new file mode 100644 index 0000000..5b11968 --- /dev/null +++ b/pykde4-4.13.97-cmake_source_dir.patch @@ -0,0 +1,29 @@ +diff -up pykde4-4.13.97/CMakeLists.txt.cmake_source_dir pykde4-4.13.97/CMakeLists.txt +--- pykde4-4.13.97/CMakeLists.txt.cmake_source_dir 2014-08-08 21:30:17.903937782 -0500 ++++ pykde4-4.13.97/CMakeLists.txt 2014-08-08 21:31:07.411422765 -0500 +@@ -251,6 +256,7 @@ python_install(__init__.py ${PYTHON_SITE + + # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. + # (Don't forget the / at the end of sip/.) ++install(FILES ${CMAKE_BINARY_DIR}/pykde_config.sip DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4/) + install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4 + PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want? + PATTERN ".svn" EXCLUDE +diff -up pykde4-4.13.97/PyKDEConfigurationInformation.cmake.cmake_source_dir pykde4-4.13.97/PyKDEConfigurationInformation.cmake +--- pykde4-4.13.97/PyKDEConfigurationInformation.cmake.cmake_source_dir 2014-07-29 12:05:46.000000000 -0500 ++++ pykde4-4.13.97/PyKDEConfigurationInformation.cmake 2014-08-08 21:30:17.908937730 -0500 +@@ -26,7 +26,7 @@ set(PYKDE_SIP_DIR "${SIP_FILES_INSTALL_D + set(PYKDE_SIP_FLAGS "${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}") + + # Create pykde_config.sip. +-configure_file(sip/kdecore/pykde_config.sip.in ${CMAKE_BINARY_DIR}/pykde_config.sip @ONLY) ++configure_file(${CMAKE_SOURCE_DIR}/sip/kdecore/pykde_config.sip.in ${CMAKE_BINARY_DIR}/pykde_config.sip @ONLY) + + # pykdeconfig.py. It is always created, but is installed only if PyQt itself + # installs pyqtconfig.py. +@@ -54,4 +54,4 @@ _pkg_config = { + } + + _default_macros = None") +-configure_file(pykdeconfig.py.in ${CMAKE_BINARY_DIR}/pykdeconfig.py) ++configure_file(${CMAKE_SOURCE_DIR}/pykdeconfig.py.in ${CMAKE_BINARY_DIR}/pykdeconfig.py) diff --git a/pykde4.spec b/pykde4.spec index 6eca6ad..0f41d23 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -15,7 +15,7 @@ Name: pykde4 Version: 4.13.97 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -41,6 +41,8 @@ Patch50: pykde4-4.12.3-python_library_realpath.patch %define sip_version_min 4.15.5 %endif Patch51: pykde4-4.12.3-sip_4_15_5.patch +# https://bugs.kde.org/show_bug.cgi?id=338137 +Patch52: pykde4-4.13.97-cmake_source_dir.patch ## upstream patches @@ -158,6 +160,7 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %if "%{?sip_version_min}" == "4.15.5" %patch51 -p1 -b .sip_4_15_5 %endif +%patch52 -p1 -b .cmake_source_dir %patch201 -p1 -b .201 %patch202 -p1 -b .202 @@ -258,6 +261,7 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %{python2_sitearch}/PyQt4/uic/pykdeuic4.py* %{_docdir}/pykde4/examples/ %{_datadir}/sip/PyKDE4/ +%{_datadir}/sip/PyKDE4/pykde_config.sip %if 0%{?python3} %files -n python3-pykde4 @@ -293,10 +297,14 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %{python3_sitearch}/PyQt4/uic/__pycache__/ %{_docdir}/python3-pykde4/examples/ %{_datadir}/python3-sip/PyKDE4/ +%{_datadir}/python3-sip/PyKDE4/pykde_config.sip %endif %changelog +* Fri Aug 08 2014 Rex Dieter 4.13.97-4 +- fix out-of-src-tree build (kde#338137) + * Fri Aug 08 2014 Rex Dieter 4.13.97-3 - fix use_system_sip_dir.patch harder