[rpms/usd] f45: Minor spec-file formatting

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

* [rpms/usd] f45: Minor spec-file formatting
@ 2026-09-19 22:03 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-09-19 22:03 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/usd
            Branch : f45
            Commit : 117be8025798146b94554e5b2e0f291a1d0ee11d
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-09-19T07:25:25+01:00
            Stats  : +72/-60 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/usd/c/117be8025798146b94554e5b2e0f291a1d0ee11d?branch=f45

            Log:
            Minor spec-file formatting

[skip changelog]

---
diff --git a/usd.spec b/usd.spec
index 05bcd6e..85a52b2 100644
--- a/usd.spec
+++ b/usd.spec
@@ -85,15 +85,15 @@ Summary:        3D VFX pipeline interchange file format
 # named Tomorrow Open Source Technology License 1.0, TOST-1.0, with no change
 # to its terms.
 License:        %{shrink:
-                Pixar AND
-                Apache-2.0 AND
-                BSD-3-Clause AND
-                BSD-2-Clause AND
-                BSL-1.0 AND
-                MIT AND
-                (MIT OR Unlicense) AND
-                (Pixar AND GPL-3.0-or-later WITH Bison-exception-2.2)
-                }
+    Pixar AND
+    Apache-2.0 AND
+    BSD-3-Clause AND
+    BSD-2-Clause AND
+    BSL-1.0 AND
+    MIT AND
+    (MIT OR Unlicense) AND
+    (Pixar AND GPL-3.0-or-later WITH Bison-exception-2.2)
+    }
 URL:            http://www.openusd.org/
 %global forgeurl https://github.com/PixarAnimationStudios/OpenUSD
 Source0:        %{forgeurl}/archive/v%{version}/OpenUSD-%{version}.tar.gz
@@ -276,6 +276,7 @@ ExclusiveArch:  %{arm64} %{x86_64}
 Universal Scene Description (USD) is a time-sampled scene
 description for interchange between graphics applications.
 
+
 %package        libs
 Summary:        Universal Scene Description library
 
@@ -409,6 +410,7 @@ Universal Scene Description (USD) is an efficient, scalable system for
 authoring, reading, and streaming time-sampled scene description for
 interchange between graphics applications.
 
+
 %package        devel
 Summary:        Development files for USD
 Requires:       usd-libs%{?_isa} = %{version}-%{release}
@@ -427,6 +429,7 @@ This package contains the C++ header files and symbolic links to the shared
 libraries for usd. If you would like to develop programs using usd,
 you will need to install usd-devel.
 
+
 # For usdview, usdcompress
 %package -n python3-usd
 Summary: %{summary}
@@ -456,6 +459,7 @@ Requires:       usd-libs%{?_isa} = %{version}-%{release}
 %description -n python3-usd
 Python language bindings for the Universal Scene Description (USD) C++ API
 
+
 %prep
 %autosetup -p1 -n OpenUSD-%{version}
 
@@ -467,9 +471,9 @@ dos2unix NOTICE.txt
 
 # Further drop shebangs line for some py files
 sed -r -i '1{/^#!/d}' \
-        pxr/usd/sdr/shaderParserTestUtils.py \
-        pxr/usd/usdUtils/updateSchemaWithSdrNode.py \
-        pxr/usdImaging/usdviewq/usdviewApi.py
+    pxr/usd/sdr/shaderParserTestUtils.py \
+    pxr/usd/usdUtils/updateSchemaWithSdrNode.py \
+    pxr/usdImaging/usdviewq/usdviewApi.py
 
 # Unbundle Google Roboto fonts
 rm -rvf pxr/usdImaging/usdviewq/fonts/*
@@ -596,55 +600,55 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1"
 
 %cmake \
 %if %{with ninja}
-     -GNinja \
+    -GNinja \
 %endif
 %if %{with jemalloc}
-     -DPXR_MALLOC_LIBRARY="%{_libdir}/libjemalloc.so" \
+    -DPXR_MALLOC_LIBRARY="%{_libdir}/libjemalloc.so" \
 %endif
-     \
-     -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS-} ${extra_flags}" \
-     -DCMAKE_CXX_STANDARD=17 \
-     -DCMAKE_C_FLAGS_RELEASE="${CFLAGS-} ${extra_flags}" \
-     -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
-     -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
-     -DCMAKE_SKIP_INSTALL_RPATH=ON \
-     -DCMAKE_SKIP_RPATH=ON \
-     -DCMAKE_VERBOSE_MAKEFILE=ON \
-     \
-     -DPXR_BUILD_HTML_DOCUMENTATION=FALSE \
-     -DPXR_BUILD_PYTHON_DOCUMENTATION=FALSE \
-     -DPXR_BUILD_EXAMPLES=OFF \
-     -DPXR_BUILD_IMAGING=ON \
-     -DPXR_BUILD_MONOLITHIC=ON \
-     -DPXR_BUILD_TESTS=%{expr:%{with test}?"ON":"OFF"} \
-     -DPXR_BUILD_TUTORIALS=OFF \
-     -DPXR_BUILD_USD_IMAGING=ON \
-     -DPXR_BUILD_EXEC=ON \
-     -DPXR_BUILD_USD_TOOLS=ON \
-     -DPXR_BUILD_USDVIEW=%{expr:%{with usdview}?"ON":"OFF"} \
-     \
-     -DPXR_BUILD_ALEMBIC_PLUGIN=%{expr:%{with alembic}?"ON":"OFF"} \
-     -DPXR_BUILD_DRACO_PLUGIN=%{expr:%{with draco}?"ON":"OFF"} \
-     -DPXR_BUILD_EMBREE_PLUGIN=%{expr:%{with embree}?"ON":"OFF"} \
-     -DPXR_BUILD_OPENCOLORIO_PLUGIN=%{expr:%{with ocio}?"ON":"OFF"} \
-     -DPXR_BUILD_OPENIMAGEIO_PLUGIN=%{expr:%{with oiio}?"ON":"OFF"} \
-     -DPXR_BUILD_PRMAN_PLUGIN=OFF \
-     \
-     -DPXR_ENABLE_OPENVDB_SUPPORT=%{expr:%{with openvdb}?"ON":"OFF"} \
-     -DPXR_ENABLE_HDF5_SUPPORT=ON \
-     -DPXR_ENABLE_PTEX_SUPPORT=%{expr:%{with ptex}?"ON":"OFF"} \
-     -DPXR_ENABLE_OSL_SUPPORT=%{expr:%{with openshading}?"ON":"OFF"} \
-     -DPXR_ENABLE_MALLOCHOOK_SUPPORT=OFF \
-     -DPXR_ENABLE_MATERIALX_SUPPORT=%{expr:%{with materialx}?"ON":"OFF"} \
-     -DPXR_ENABLE_PYTHON_SUPPORT=ON \
-     \
-     -DPXR_INSTALL_LOCATION="%{_libdir}/usd/plugin" \
-     \
-     -DPXR_VALIDATE_GENERATED_CODE=OFF \
-     \
-     -DPYSIDEUICBINARY:PATH=pyside6-uic \
-     -DPYSIDE_AVAILABLE=ON \
-     -DPYTHON_EXECUTABLE=%{python3}
+    \
+    -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS-} ${extra_flags}" \
+    -DCMAKE_CXX_STANDARD=17 \
+    -DCMAKE_C_FLAGS_RELEASE="${CFLAGS-} ${extra_flags}" \
+    -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
+    -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
+    -DCMAKE_SKIP_INSTALL_RPATH=ON \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    \
+    -DPXR_BUILD_HTML_DOCUMENTATION=FALSE \
+    -DPXR_BUILD_PYTHON_DOCUMENTATION=FALSE \
+    -DPXR_BUILD_EXAMPLES=OFF \
+    -DPXR_BUILD_IMAGING=ON \
+    -DPXR_BUILD_MONOLITHIC=ON \
+    -DPXR_BUILD_TESTS=%{expr:%{with test}?"ON":"OFF"} \
+    -DPXR_BUILD_TUTORIALS=OFF \
+    -DPXR_BUILD_USD_IMAGING=ON \
+    -DPXR_BUILD_EXEC=ON \
+    -DPXR_BUILD_USD_TOOLS=ON \
+    -DPXR_BUILD_USDVIEW=%{expr:%{with usdview}?"ON":"OFF"} \
+    \
+    -DPXR_BUILD_ALEMBIC_PLUGIN=%{expr:%{with alembic}?"ON":"OFF"} \
+    -DPXR_BUILD_DRACO_PLUGIN=%{expr:%{with draco}?"ON":"OFF"} \
+    -DPXR_BUILD_EMBREE_PLUGIN=%{expr:%{with embree}?"ON":"OFF"} \
+    -DPXR_BUILD_OPENCOLORIO_PLUGIN=%{expr:%{with ocio}?"ON":"OFF"} \
+    -DPXR_BUILD_OPENIMAGEIO_PLUGIN=%{expr:%{with oiio}?"ON":"OFF"} \
+    -DPXR_BUILD_PRMAN_PLUGIN=OFF \
+    \
+    -DPXR_ENABLE_OPENVDB_SUPPORT=%{expr:%{with openvdb}?"ON":"OFF"} \
+    -DPXR_ENABLE_HDF5_SUPPORT=ON \
+    -DPXR_ENABLE_PTEX_SUPPORT=%{expr:%{with ptex}?"ON":"OFF"} \
+    -DPXR_ENABLE_OSL_SUPPORT=%{expr:%{with openshading}?"ON":"OFF"} \
+    -DPXR_ENABLE_MALLOCHOOK_SUPPORT=OFF \
+    -DPXR_ENABLE_MATERIALX_SUPPORT=%{expr:%{with materialx}?"ON":"OFF"} \
+    -DPXR_ENABLE_PYTHON_SUPPORT=ON \
+    \
+    -DPXR_INSTALL_LOCATION="%{_libdir}/usd/plugin" \
+    \
+    -DPXR_VALIDATE_GENERATED_CODE=OFF \
+    \
+    -DPYSIDEUICBINARY:PATH=pyside6-uic \
+    -DPYSIDE_AVAILABLE=ON \
+    -DPYTHON_EXECUTABLE=%{python3}
 %cmake_build
 
 %install
@@ -682,18 +686,22 @@ install -d '%{buildroot}%{_mandir}/man1'
 for cmd in %{buildroot}%{_bindir}/*
 do
   PYTHONPATH='%{buildroot}%{python3_sitearch}' \
-  LD_LIBRARY_PATH='%{buildroot}%{_libdir}' \
+      LD_LIBRARY_PATH='%{buildroot}%{_libdir}' \
       help2man \
       --no-info --no-discard-stderr --version-string='%{version}' \
       --output="%{buildroot}%{_mandir}/man1/$(basename "${cmd}").1" \
       "${cmd}"
 done
 
+
 %check
 %if %{with usdview}
 desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.desktop
 %endif
-%{?with_test:%ctest}
+%if %{with test}
+%ctest
+%endif
+
 
 %files
 %doc NOTICE.txt README.md
@@ -761,9 +769,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d
 %{_mandir}/man1/usdview.1*
 %endif
 
+
 %files -n python3-usd
 %{python3_sitearch}/pxr/
 
+
 %files libs
 %license LICENSE.txt
 %doc NOTICE.txt README.md
@@ -776,6 +786,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d
 # but this is probably too fussy.)
 %{_libdir}/usd/
 
+
 %files devel
 %doc BUILDING.md CHANGELOG.md VERSIONS.md
 %{_includedir}/pxr/
@@ -784,5 +795,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.d
 %{_libdir}/cmake/pxr/pxrTargets.cmake
 %{_libdir}/cmake/pxr/pxrTargets-release.cmake
 
+
 %changelog
 %autochangelog

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-19 22:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-19 22:03 [rpms/usd] f45: Minor spec-file formatting Benjamin A. Beasley

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox