Hello community, here is the log from the commit of package libArcus for openSUSE:Factory checked in at 2019-10-14 12:41:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libArcus (Old) and /work/SRC/openSUSE:Factory/.libArcus.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libArcus" Mon Oct 14 12:41:45 2019 rev:7 rq:737940 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libArcus/libArcus.changes 2019-06-14 20:42:46.754354305 +0200 +++ /work/SRC/openSUSE:Factory/.libArcus.new.2352/libArcus.changes 2019-10-14 12:41:58.458626156 +0200 @@ -1,0 +2,24 @@ +Sun Oct 13 00:26:40 UTC 2019 - Stefan Brüns <[email protected]> + +- Make sure the package actually builds, add + 0001-Install-the-Python-extension-module-to-Python-sitear.patch + 0002-Fix-Python3_SITEARCH-for-old-cmake.patch + +------------------------------------------------------------------- +Fri Sep 27 06:25:31 UTC 2019 - Adrian Schröter <[email protected]> + +- update to version 4.3.0 + * no code changes + +------------------------------------------------------------------- +Thu Sep 5 07:42:23 UTC 2019 - Adrian Schröter <[email protected]> + +- fix build for factory + +------------------------------------------------------------------- +Mon Aug 12 06:49:54 UTC 2019 - Adrian Schröter <[email protected]> + +- udpate to version 4.2.0 + * just build env changes + +------------------------------------------------------------------- Old: ---- libArcus-4.1.0.obscpio New: ---- 0001-Install-the-Python-extension-module-to-Python-sitear.patch 0002-Fix-Python3_SITEARCH-for-old-cmake.patch libArcus-4.3.0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libArcus.spec ++++++ --- /var/tmp/diff_new_pack.QABIdy/_old 2019-10-14 12:42:00.658620402 +0200 +++ /var/tmp/diff_new_pack.QABIdy/_new 2019-10-14 12:42:00.662620392 +0200 @@ -18,13 +18,16 @@ %define sover 3 Name: libArcus -Version: 4.1.0 +Version: 4.3.0 Release: 0 Summary: 3D printer control software License: LGPL-3.0-only Group: Development/Libraries/C and C++ Url: http://github.com/Ultimaker/%name Source: %name-%{version}.tar.xz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Install-the-Python-extension-module-to-Python-sitear.patch +Patch1: 0002-Fix-Python3_SITEARCH-for-old-cmake.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: protobuf-devel >= 3.0.0 @@ -53,10 +56,13 @@ %prep %setup +%patch0 -p1 +%patch1 -p1 %build %cmake -make %{?_smp_mflags} + +%cmake_build %install %cmake_install @@ -74,7 +80,7 @@ %files -n %name%{sover} %license LICENSE %doc README.md -%{python3_sitelib}/Arcus.so +%{python3_sitearch}/Arcus.so %{_libdir}/libArcus.so.* %changelog ++++++ 0001-Install-the-Python-extension-module-to-Python-sitear.patch ++++++ >From 9dc7e06fcdf0d0bf0342b63e2a27f586aa783ece Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]> Date: Thu, 27 Jun 2019 15:30:47 +0200 Subject: [PATCH 1/2] Install the Python extension module to Python sitearch, not sitelib The sitearch directory is used for compiled code, such as this extension module. See https://github.com/Ultimaker/libArcus/pull/94#issuecomment-505376760 --- cmake/SIPMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake index 00a5f9f..14544d2 100644 --- a/cmake/SIPMacros.cmake +++ b/cmake/SIPMacros.cmake @@ -124,6 +124,6 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES SUFFIX ".pyd" IMPORT_PREFIX "_") ENDIF (WIN32) - INSTALL(TARGETS ${_logical_name} DESTINATION "${Python3_SITELIB}/${_parent_module_path}") + INSTALL(TARGETS ${_logical_name} DESTINATION "${Python3_SITEARCH}/${_parent_module_path}") ENDMACRO(ADD_SIP_PYTHON_MODULE) -- 2.23.0 ++++++ 0002-Fix-Python3_SITEARCH-for-old-cmake.patch ++++++ >From a82e555c0fdd07a8038696b740207fd8943cd65c Mon Sep 17 00:00:00 2001 From: Lipu Fei <[email protected]> Date: Thu, 8 Aug 2019 13:29:15 +0200 Subject: [PATCH 2/2] Fix Python3_SITEARCH for old cmake --- cmake/FindSIP.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake index 3ca9a9f..815a16d 100644 --- a/cmake/FindSIP.cmake +++ b/cmake/FindSIP.cmake @@ -48,6 +48,19 @@ if(${CMAKE_VERSION} VERSION_LESS 3.12) else() message(FATAL_ERROR "Failed to get Python3_SITELIB. Error: ${_process_output}") endif() + + execute_process( + COMMAND ${Python3_EXECUTABLE} -c + "import distutils.sysconfig; print(distutils.sysconfig.get_python_lib(plat_specific=True,standard_lib=False))" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(${_process_status} EQUAL 0) + string(STRIP ${_process_output} Python3_SITEARCH) + else() + message(FATAL_ERROR "Failed to get Python3_SITEARCH. Error: ${_process_output}") + endif() else() # Use FindPython3 for CMake >=3.12 find_package(Python3 3.4 REQUIRED COMPONENTS Interpreter Development) -- 2.23.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QABIdy/_old 2019-10-14 12:42:00.710620267 +0200 +++ /var/tmp/diff_new_pack.QABIdy/_new 2019-10-14 12:42:00.710620267 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/Ultimaker/libArcus</param> <param name="scm">git</param> - <param name="revision">4.1.0</param> - <param name="version">4.1.0</param> + <param name="revision">4.3.0</param> + <param name="version">4.3.0</param> <param name="submodules">disable</param> </service> <service mode="disabled" name="set_version" /> ++++++ libArcus-4.1.0.obscpio -> libArcus-4.3.0.obscpio ++++++ ++++++ libArcus.obsinfo ++++++ --- /var/tmp/diff_new_pack.QABIdy/_old 2019-10-14 12:42:00.826619963 +0200 +++ /var/tmp/diff_new_pack.QABIdy/_new 2019-10-14 12:42:00.830619953 +0200 @@ -1,5 +1,5 @@ name: libArcus -version: 4.1.0 +version: 4.3.0 mtime: 1554879657 commit: e15df8325ade416655857c19552f05ed7e61b396
