[rpms/usd] rawhide: Use various long options

[Benjamin A. Beasley <code@musicinmybrain.net>]

            A new commit has been pushed.

            Repo   : rpms/usd
            Branch : rawhide
            Commit : afdbbc040283b29171c149e5ee2e4bc3252655fa
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-09-19T08:01:23+01:00
            Stats  : +35/-34 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/usd/c/afdbbc040283b29171c149e5ee2e4bc3252655fa?branch=rawhide

            Log:
            Use various long options

[skip changelog]

---
diff --git a/usd.spec b/usd.spec
index a46123c..f505ea3 100644
--- a/usd.spec
+++ b/usd.spec
@@ -463,28 +463,29 @@ dos2unix NOTICE.txt
 %py3_shebang_fix .
 
 # Further drop shebangs line for some py files
-sed -r -i '1{/^#!/d}' \
+sed --regexp-extended --in-place '1{/^#!/d}' \
     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/*
-ln -s %{_datadir}/fonts/google-roboto pxr/usdImaging/usdviewq/fonts/Roboto
-ln -s %{_datadir}/fonts/google-roboto-mono \
+rm --recursive --verbose pxr/usdImaging/usdviewq/fonts/*
+ln --symbolic %{_datadir}/fonts/google-roboto \
+    pxr/usdImaging/usdviewq/fonts/Roboto
+ln --symbolic %{_datadir}/fonts/google-roboto-mono \
     pxr/usdImaging/usdviewq/fonts/Roboto_Mono
 
 # Unbundle stb_image, stb_image_write, stb_image_resize:
 pushd pxr/imaging/hio/stb
-cp -p %{_usr}/include/stb_image.h .
+cp --preserve %{_usr}/include/stb_image.h .
 patch -p1 < stb_image.patch
-ln -svf %{_usr}/include/stb_image_resize.h \
+ln --symbolic --verbose --force %{_usr}/include/stb_image_resize.h \
     %{_usr}/include/stb_image_write.h ./
 popd
 
 # Remove bundled doxygen-awesome-css (CSS and JS files) since we are not
 # building Doxygen-generated HTML documentation.
-rm -rf docs/doxygen/doxygen-awesome-css/
+rm --recursive --verbose docs/doxygen/doxygen-awesome-css/
 
 # Remove the bundled copy of double-conversion.
 #
@@ -504,14 +505,14 @@ done
 # Similarly, remove the bundled copy of lz4. Change in the bundled copy can be
 # identified by source-code comments, and appear to be limited to adding
 # namespaces and removing C linkage.
-rm -v pxr/base/tf/pxrLZ4/*
+rm --verbose pxr/base/tf/pxrLZ4/*
 cat > pxr/base/tf/pxrLZ4/lz4.h <<'EOF'
 #include <lz4.h>
 // System LZ4 has C linkage; this just allows "using namespace"
 namespace pxr_lz4 {}
 EOF
 # Remove the bundled copy of cli11.
-rm -v pxr/base/tf/pxrCLI11/*
+rm --verbose pxr/base/tf/pxrCLI11/*
 cat > pxr/base/tf/pxrCLI11/CLI11.h <<'EOF'
 #include <CLI/CLI.hpp>
 namespace pxr_CLI = CLI;
@@ -527,7 +528,7 @@ EOF
 done
 # Remove the bundled copy of rapidjson. It does not seem to have been modified
 # or forked at all.
-rm -rv pxr/base/js/rapidjson/
+rm --recursive --verbose pxr/base/js/rapidjson/
 # Remove the bundled copy of robin-map. There are several macros that are
 # renamed from TSL_*/tsl_* to PXR_TSL_*/pxr_tsl_* in the bundled copy, and we
 # could “alias” these if necessary to avoid patching call sites, but for now
@@ -542,43 +543,45 @@ namespace pxr_tsl = tsl;
 EOF
 done
 # Remove the bundled copy of libdeflate.
-rm -rv pxr/imaging/plugin/hioOpenEXR/OpenEXR/deflate/
+rm --recursive --verbose pxr/imaging/plugin/hioOpenEXR/OpenEXR/deflate/
 # Remove the bundled copies of libavif, along with the associated libaom and
 # the libyuv that is in the libavif sources.
-rm -rv pxr/imaging/plugin/hioAvif/aom/ \
+rm --recursive --verbose pxr/imaging/plugin/hioAvif/aom/ \
     pxr/imaging/plugin/hioAvif/AVIF/
 
 # Use c++17 standard otherwise build fails
-sed -i 's|set(CMAKE_CXX_STANDARD 14)|set(CMAKE_CXX_STANDARD 17)|g' \
+sed --in-place 's|set(CMAKE_CXX_STANDARD 14)|set(CMAKE_CXX_STANDARD 17)|g' \
         cmake/defaults/CXXDefaults.cmake
 
 # Fix libdir installation
-sed -i 's|lib/usd|%{_libdir}/usd|g' \
+sed --in-place 's|lib/usd|%{_libdir}/usd|g' \
         cmake/macros/{Private,Public}.cmake
-sed -i 's|plugin/usd|%{_libdir}/usd/plugin|g' \
+sed --in-place 's|plugin/usd|%{_libdir}/usd/plugin|g' \
         cmake/macros/{Private,Public}.cmake
-sed -i 's|"lib"|%{_libdir}|g' \
+sed --in-place 's|"lib"|%{_libdir}|g' \
         cmake/macros/{Private,Public}.cmake
-sed -i 's|/python|/python%{python3_version}/site-packages|g' \
-        cmake/macros/{Private,Public}.cmake pxr/usdImaging/usdviewq/CMakeLists.txt
-sed -i 's|/pxrConfig.cmake|%{_libdir}/cmake/pxr/pxrConfig.cmake|g' \
+sed --in-place 's|/python|/python%{python3_version}/site-packages|g' \
+        cmake/macros/{Private,Public}.cmake \
+        pxr/usdImaging/usdviewq/CMakeLists.txt
+sed --in-place 's|/pxrConfig.cmake|%{_libdir}/cmake/pxr/pxrConfig.cmake|g' \
         pxr/CMakeLists.txt
-sed -i 's|"cmake"|"%{_libdir}/cmake/pxr"|g' \
+sed --in-place 's|"cmake"|"%{_libdir}/cmake/pxr"|g' \
         pxr/CMakeLists.txt
-sed -i 's|${PXR_CMAKE_DIR}/cmake|${PXR_CMAKE_DIR}|g' \
+sed --in-place 's|${PXR_CMAKE_DIR}/cmake|${PXR_CMAKE_DIR}|g' \
         pxr/pxrConfig.cmake.in
-sed -i 's|${PXR_CMAKE_DIR}/include|/usr/include|g' \
+sed --in-place 's|${PXR_CMAKE_DIR}/include|/usr/include|g' \
         pxr/pxrConfig.cmake.in
-sed -i 's|EXACT COMPONENTS|COMPONENTS|g' \
+sed --in-place 's|EXACT COMPONENTS|COMPONENTS|g' \
         pxr/pxrConfig.cmake.in
 
 # Fix cmake directory destination
-sed -i 's|"${CMAKE_INSTALL_PREFIX}"|%{_libdir}/cmake/pxr|g' pxr/CMakeLists.txt
+sed --in-place 's|"${CMAKE_INSTALL_PREFIX}"|%{_libdir}/cmake/pxr|g' \
+    pxr/CMakeLists.txt
 
 # Use Embree4 instead of Embree3. The find-then-modify pattern preserves mtimes
 # on sources that did not need to be modified.
 find . -type f -exec gawk '/embree3/ { print FILENAME }' '{}' '+' |
-  xargs -r sed -r -i 's/(embree)3/\14/'
+  xargs --no-run-if-empty sed --regexp-extended --in-place 's/(embree)3/\14/'
 
 
 %build
@@ -645,12 +648,13 @@ extra_flags="${extra_flags-} -DTBB_SUPPRESS_DEPRECATED_MESSAGES=1"
 %cmake_install
 
 # Fix python3 files installation
-mkdir -p %{buildroot}%{python3_sitearch}
+mkdir --parents %{buildroot}%{python3_sitearch}
 mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch}
 
 # Upstream may expect to use this as a script in development, but we install it
 # without executable permissions, so we remove the shebang.
-sed -r -i '1{/^#!/d}' '%{buildroot}%{python3_sitearch}/pxr/Usd/usdGenSchema.py'
+sed --regexp-extended --in-place '1{/^#!/d}' \
+    '%{buildroot}%{python3_sitearch}/pxr/Usd/usdGenSchema.py'
 
 %if %{with usdview}
 # Install a desktop icon for usdview
@@ -661,18 +665,14 @@ desktop-file-install                                    \
 
 # Little hack until this issue is resolved
 # https://github.com/PixarAnimationStudios/OpenUSD/issues/3310
-sed -i 's|OpenGL::GL|${OPENGL_gl_LIBRARY}|g' \
+sed --in-place 's|OpenGL::GL|${OPENGL_gl_LIBRARY}|g' \
         %{buildroot}%{_libdir}/cmake/pxr/pxrTargets.cmake
 
-# Remove examples that were built and installed even though we set
-# -DPXR_BUILD_EXAMPLES=OFF.
-rm -vrf '%{buildroot}%{_datadir}/usd/examples'
-
 # Generate and install man pages. While generating the man pages might more
 # properly go in %%build, it is generally much easier to do this here in a
 # single step, using the entry points installed into the buildroot. This is
 # especially true for the entry points that are Python scripts.
-install -d '%{buildroot}%{_mandir}/man1'
+install --directory '%{buildroot}%{_mandir}/man1'
 for cmd in %{buildroot}%{_bindir}/*
 do
   PYTHONPATH='%{buildroot}%{python3_sitearch}' \
@@ -686,7 +686,8 @@ done
 
 %check
 %if %{with usdview}
-desktop-file-validate %{buildroot}%{_datadir}/applications/org.openusd.usdview.desktop
+desktop-file-validate \
+    '%{buildroot}%{_datadir}/applications/org.openusd.usdview.desktop'
 %endif
 %if %{with test}
 %ctest