diff --git a/usd.spec b/usd.spec index 0c66d7d..18ad7a3 100644 --- a/usd.spec +++ b/usd.spec @@ -19,11 +19,7 @@ %bcond ocio 1 %bcond oiio 1 %bcond ptex 1 -# In order to re-enable usdview with PySide6, we would need to re-generate the -# Python code from .ui files using pyside6-uic, which is not packaged -# (https://bugzilla.redhat.com/show_bug.cgi?id=2301717). This would require -# updating or replacing our uic-wrapper script (see the end of %%prep). -%bcond usdview 0 +%bcond usdview 1 # TODO: Figure out how to re-enable the tests. Currently these want to install # into /usr/tests and, and there are issues with the launchers finding the # command-line tools in the buildroot. @@ -287,11 +283,11 @@ you will need to install usd-devel. Summary: %{summary} BuildRequires: pkgconfig(python3) -BuildRequires: pkgconfig(Qt5) BuildRequires: python3dist(jinja2) %if %{with usdview} BuildRequires: desktop-file-utils BuildRequires: python3dist(pyside6) +BuildRequires: pyside6-tools %endif BuildRequires: python3dist(pyopengl) Requires: font(roboto) @@ -376,13 +372,6 @@ sed -i 's|"${CMAKE_INSTALL_PREFIX}"|%{_libdir}/cmake/pxr|g' pxr/CMakeLists.txt find . -type f -exec gawk '/embree3/ { print FILENAME }' '{}' '+' | xargs -r sed -r -i 's/(embree)3/\14/' -# Fix uic-qt5 use -cat > uic-wrapper <<'EOF' -#!/bin/sh -exec uic-qt5 -g python "$@" -EOF -chmod +x uic-wrapper - %build # The necessary include path for Imath is not set everywhere it’s needed. It’s @@ -440,7 +429,7 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1" \ -DPXR_VALIDATE_GENERATED_CODE=OFF \ \ - -DPYSIDEUICBINARY:PATH=${PWD}/uic-wrapper \ + -DPYSIDEUICBINARY:PATH=pyside6-uic \ -DPYSIDE_AVAILABLE=ON \ -DPYTHON_EXECUTABLE=%{python3} %cmake_build