Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package FreeCAD for openSUSE:Factory checked in at 2023-09-12 21:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/FreeCAD (Old) and /work/SRC/openSUSE:Factory/.FreeCAD.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "FreeCAD" Tue Sep 12 21:02:30 2023 rev:45 rq:1110358 version:0.21.1 Changes: -------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-test.changes 2023-05-04 17:11:37.780735628 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.1766/FreeCAD-test.changes 2023-09-12 21:02:57.584339018 +0200 @@ -1,0 +2,5 @@ +Mon Sep 11 10:55:03 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to version 0.21.1 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD.changes 2023-08-09 17:34:35.944871390 +0200 +++ /work/SRC/openSUSE:Factory/.FreeCAD.new.1766/FreeCAD.changes 2023-09-12 21:02:57.604339731 +0200 @@ -1,0 +2,15 @@ +Mon Sep 11 10:52:51 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to version 0.21.1: + * Bugfix release, for details see + https://github.com/FreeCAD/FreeCAD/releases/tag/0.21.1 + +------------------------------------------------------------------- +Wed Aug 10 15:42:59 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Disable AddonManager extension on Leap 15.x, as it requires + Python >= 3.8 +- Add 0001-Implement-math.comb-fallback-for-Python-3.6.patch +- Minor packaging cleanups + +------------------------------------------------------------------- @@ -7 +22 @@ - https://github.com/FreeCAD/FreeCAD/releases/tag/0.21 + https://github.com/FreeCAD/FreeCAD/releases/tag/0.21.0 Old: ---- FreeCAD-0.21.0.tar.gz New: ---- 0001-Implement-math.comb-fallback-for-Python-3.6.patch FreeCAD-0.21.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FreeCAD-test.spec ++++++ --- /var/tmp/diff_new_pack.NGgTe0/_old 2023-09-12 21:03:01.244469572 +0200 +++ /var/tmp/diff_new_pack.NGgTe0/_new 2023-09-12 21:03:01.244469572 +0200 @@ -17,7 +17,7 @@ Name: FreeCAD-test -Version: 0.21.0 +Version: 0.21.1 Release: 0 Summary: Meta source package that runs the FreeCAD testsuite when built License: GPL-2.0-or-later AND LGPL-2.0-or-later ++++++ FreeCAD.spec ++++++ --- /var/tmp/diff_new_pack.NGgTe0/_old 2023-09-12 21:03:01.268470428 +0200 +++ /var/tmp/diff_new_pack.NGgTe0/_new 2023-09-12 21:03:01.272470571 +0200 @@ -20,14 +20,17 @@ %if 0%{?suse_version} > 1500 %bcond_without boost_signals2 +# The AddonManager requires Python >= 3.8 +%bcond_without fc_addonmanager %else %bcond_with boost_signals2 +%bcond_with fc_addonmanager %endif %bcond_with smesh_external %bcond_without smesh Name: FreeCAD -Version: 0.21.0 +Version: 0.21.1 Release: 0 Summary: General Purpose 3D CAD Modeler License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -38,6 +41,8 @@ Patch0: 0001-Gui-Quarter-Add-missing-OpenGL-includes.patch # PATCH-FIX-OPENSUSE Patch1: 0001-Avoid-catching-SIGSEGV-defer-to-system-services.patch +# PATCH-FIX-OPENSUSE +Patch2: 0001-Implement-math.comb-fallback-for-Python-3.6.patch # PATCH-FIX-UPSTREAM Patch9: 0001-Fix-variable-name-for-OpenGL-library.patch @@ -139,7 +144,8 @@ %autopatch -p1 # Use system gtest - https://github.com/FreeCAD/FreeCAD/issues/10126 sed -i -e 's/add_subdirectory(lib)/find_package(GTest)/' \ - -e 's/ gtest_main / GTest::gtest_main /' \ + -e 's/ gtest_main/ GTest::gtest_main/' \ + -e 's/ gmock_main/ GTest::gmock_main/' \ tests/CMakeLists.txt # Lower Python minimum version for Leap sed -i -e 's/3.8/3.6/' cMake/FreeCAD_Helpers/SetupPython.cmake @@ -153,11 +159,14 @@ sed -i '1 s@#!.*@#!%{__python3}@' \ src/Mod/AddonManager/AddonManager.py \ src/Mod/Mesh/App/MeshTestsApp.py \ + src/Mod/Part/parttests/ColorPerFaceTest.py \ + src/Mod/Part/parttests/TopoShapeListTest.py \ src/Mod/Robot/KukaExporter.py \ src/Mod/Robot/MovieTool.py \ src/Mod/Spreadsheet/importXLSX.py \ src/Mod/TechDraw/TDTest/D*Test.py \ - src/Mod/Test/testmakeWireString.py + src/Mod/Test/testmakeWireString.py \ + src/Mod/Test/unittestgui.py # Fix "wrong-script-end-of-line-encoding" rpmlint warning sed -i 's/\r$//' src/Mod/Mesh/App/MeshTestsApp.py @@ -211,6 +220,7 @@ -DBUILD_FEM:BOOL=%{?with_smesh:ON}%{!?with_smesh:OFF} \ -DBUILD_FEM_NETGEN:BOOL=ON \ -DBUILD_FEM_VTK:BOOL=ON \ + -DBUILD_ADDONMGR:BOOL=%{?with_fc_addonmanager:ON}%{!?with_fc_addonmanager:OFF} \ -Wno-dev \ .. @@ -221,18 +231,25 @@ # Fix "non-executable-script" rpmlint warning # Run after install, as CMake "install(FILES...) sets rw- permissions -chmod 755 %{buildroot}%{_libdir}/FreeCAD/Mod/AddonManager/AddonManager.py \ - %{buildroot}%{_libdir}/FreeCAD/Mod/Robot/KukaExporter.py \ +%if %{with fc_addonmanager} +chmod 755 %{buildroot}%{_libdir}/FreeCAD/Mod/AddonManager/AddonManager.py +%endif +chmod 755 %{buildroot}%{_libdir}/FreeCAD/Mod/Robot/KukaExporter.py \ %{buildroot}%{_libdir}/FreeCAD/Mod/Robot/MovieTool.py \ %{buildroot}%{_libdir}/FreeCAD/Mod/Spreadsheet/importXLSX.py \ %{buildroot}%{_libdir}/FreeCAD/Mod/TechDraw/TDTest/D*Test.py \ - %{buildroot}%{_libdir}/FreeCAD/Mod/Test/testmakeWireString.py + %{buildroot}%{_libdir}/FreeCAD/Mod/Test/testmakeWireString.py \ + %{buildroot}%{_libdir}/FreeCAD/Mod/Mesh/MeshTestsApp.py \ + %{buildroot}%{_libdir}/FreeCAD/Mod/Part/parttests/ColorPerFaceTest.py \ + %{buildroot}%{_libdir}/FreeCAD/Mod/Part/parttests/TopoShapeListTest.py \ + %{buildroot}%{_libdir}/FreeCAD/Mod/Test/unittestgui.py %suse_update_desktop_file -r org.freecadweb.FreeCAD Education Engineering # Remove unneeded files find %{buildroot} -type f -name "*.la" -delete -print rm -Rf %{buildroot}%{_datadir}/pixmaps +rm %{buildroot}%{x_prefix}/include/E57Format/E57Export.h # Broken rm -Rf %{buildroot}%{_datadir}/thumbnailers ++++++ 0001-Implement-math.comb-fallback-for-Python-3.6.patch ++++++ >From 2e6041b656fbd3db87109ea0c116e568c7c984e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Thu, 10 Aug 2023 15:48:55 +0200 Subject: [PATCH] Implement math.comb fallback for Python 3.6 --- src/Mod/PartDesign/fcgear/involute.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Mod/PartDesign/fcgear/involute.py b/src/Mod/PartDesign/fcgear/involute.py index 15df79f..307ff6b 100644 --- a/src/Mod/PartDesign/fcgear/involute.py +++ b/src/Mod/PartDesign/fcgear/involute.py @@ -24,7 +24,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 from math import cos, sin, tan, pi, acos, asin, atan, sqrt, radians -from math import comb as binom +try: + from math import comb as binom +except ImportError: + from math import factorial + def binom(n, k): + return 0 if k > n else \ + factorial(n) / (factorial(k) * factorial(n - k)) def CreateExternalGear(w, m, Z, phi, -- 2.41.0 ++++++ FreeCAD-0.21.0.tar.gz -> FreeCAD-0.21.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/FreeCAD/FreeCAD-0.21.0.tar.gz /work/SRC/openSUSE:Factory/.FreeCAD.new.1766/FreeCAD-0.21.1.tar.gz differ: char 31, line 1
