The package rpms/freecad.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/freecad.git/commit/?id=2af31342431fa... https://src.fedoraproject.org/cgit/rpms/freecad.git/commit/?id=480deffd3f9fc....
Change: +%ifarch i686 -%ifarch i686
Thanks.
Full change: ============
commit 480deffd3f9fced8676ad9d2ccbaefa366904127 Author: Richard Shaw hobbes1069@gmail.com Date: Sun May 19 21:26:01 2019 -0500
Try to fix python_suffix the right way.
diff --git a/freecad.spec b/freecad.spec index 1c5fc47..f7bc1e6 100644 --- a/freecad.spec +++ b/freecad.spec @@ -2,7 +2,8 @@ # https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilat... %global _python_bytecompile_extra 1
-#global pre 1 +# Setup python target for shiboken so the right cmake file is imported. +%define py_suffix %(%{__python3} -c 'import sysconfig; sysconfig.get_config_var("SOABI")')
# Maintainers: keep this list of plugins up to date # List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here @@ -138,12 +139,6 @@ dos2unix -k src/Mod/Test/unittestgui.py \ %build mkdir build && pushd build
-# Setup python target for shiboken so the right cmake file is imported. -%ifarch i686 - %global py_suffix .cpython-37m-i386-linux-gnu -%else - %global py_suffix .cpython-37m-%{_target}-gnu -%endif
# Deal with cmake projects that tend to link excessively. CXXFLAGS='-Wno-error=cast-function-type'; export CXXFLAGS
commit 2af31342431fa763c6144d956c46b78216d6b54b Author: Richard Shaw hobbes1069@gmail.com Date: Sun May 19 21:02:33 2019 -0500
Tweak python_suffix for i686.
diff --git a/freecad.spec b/freecad.spec index e9b4c5a..1c5fc47 100644 --- a/freecad.spec +++ b/freecad.spec @@ -138,6 +138,13 @@ dos2unix -k src/Mod/Test/unittestgui.py \ %build mkdir build && pushd build
+# Setup python target for shiboken so the right cmake file is imported. +%ifarch i686 + %global py_suffix .cpython-37m-i386-linux-gnu +%else + %global py_suffix .cpython-37m-%{_target}-gnu +%endif + # Deal with cmake projects that tend to link excessively. CXXFLAGS='-Wno-error=cast-function-type'; export CXXFLAGS LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS @@ -148,7 +155,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DRESOURCEDIR=%{_datadir}/%{name} \ -DPYTHON_EXECUTABLE=%{__python3} \ - -DPYTHON_SUFFIX=.cpython-37m-%{_target}-gnu \ + -DPYTHON_SUFFIX=%{py_suffix} \ -DOpenGL_GL_PREFERENCE=GLVND \ -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin3 \ -DCOIN3D_DOC_PATH=%{_datadir}/Coin3/Coin \
commit 219347609b4f47d8eeed3eb48a4fc773f1baacb8 Author: Richard Shaw hobbes1069@gmail.com Date: Sun May 19 20:50:15 2019 -0500
Fix python_suffix target.
diff --git a/freecad.spec b/freecad.spec index 7aacdd2..e9b4c5a 100644 --- a/freecad.spec +++ b/freecad.spec @@ -148,7 +148,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \ -DRESOURCEDIR=%{_datadir}/%{name} \ -DPYTHON_EXECUTABLE=%{__python3} \ - -DPYTHON_SUFFIX=.cpython-37m-x86_64-linux-gnu \ + -DPYTHON_SUFFIX=.cpython-37m-%{_target}-gnu \ -DOpenGL_GL_PREFERENCE=GLVND \ -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin3 \ -DCOIN3D_DOC_PATH=%{_datadir}/Coin3/Coin \
arch-excludes@lists.fedoraproject.org