public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/morphio] rawhide: Use various long options
@ 2026-09-09  5:36 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-09-09  5:36 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/morphio
            Branch : rawhide
            Commit : 426533b9425ff14be2928bf54c9b91552eb208db
            Author : Benjamin A. Beasley <code@musicinmybrain.net>
            Date   : 2026-09-09T06:33:13+01:00
            Stats  : +14/-12 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/morphio/c/426533b9425ff14be2928bf54c9b91552eb208db?branch=rawhide

            Log:
            Use various long options

[skip changelog]

---
diff --git a/morphio.spec b/morphio.spec
index f30ad7a..a9964de 100644
--- a/morphio.spec
+++ b/morphio.spec
@@ -146,24 +146,26 @@ This package provides documentation for MorphIO
 %autosetup -n MorphIO-%{version} -p1
 
 # Unbundle gsl-lite
-rm -rvf 3rdparty/GSL_LITE
-sed -r -i '/GSL_LITE/d' MANIFEST.in
-sed -r -i '/director.*\(.*(gsl-lite|GSL_LITE).*\)/d' 3rdparty/CMakeLists.txt
-sed -r -i \
-    -e '/TARGET_PROPERTY:gsl-lite,INTERFACE_INCLUDE_DIRECTORIES/d' \
-    -e 's/PUBLIC[[:blank:]]+gsl-lite[[:blank:]]+(PRIVATE)/\1/' \
+rm --recursive --verbose --force 3rdparty/GSL_LITE
+sed --regexp-extended --in-place '/GSL_LITE/d' MANIFEST.in
+sed --regexp-extended --in-place '/director.*\(.*(gsl-lite|GSL_LITE).*\)/d' \
+    3rdparty/CMakeLists.txt
+sed --regexp-extended --in-place \
+    --expression='/TARGET_PROPERTY:gsl-lite,INTERFACE_INCLUDE_DIRECTORIES/d' \
+    --expression='s/PUBLIC[[:blank:]]+gsl-lite[[:blank:]]+(PRIVATE)/\1/' \
     src/CMakeLists.txt
 # Update includes. Note that this affects the public API headers.
 #
 # The grep-then-sed pattern means we only modify those files that need it,
 # preserving the mtimes on the others.
-grep -ErIl '#[[:blank:]]*include[[:blank:]]+["<]gsl/gsl[">]' . |
-  xargs -r sed -r -i \
+grep --extended-regexp --recursive --files-with-matches -I \
+    '#[[:blank:]]*include[[:blank:]]+["<]gsl/gsl[">]' . |
+  xargs --no-run-if-empty sed --regexp-extended --in-place \
       's@(#[[:blank:]]*include[[:blank:]]+["<]gsl/gsl)([">])@\1-lite\.hpp\2@'
 
 # Unbundle lexertl
-rm -rvf '3rdparty/lexertl'
-ln -s '%{_includedir}/lexertl' '3rdparty/'
+rm --recursive --verbose --force '3rdparty/lexertl'
+ln --symbolic '%{_includedir}/lexertl' '3rdparty/'
 
 # Some of these could make it into the installed package:
 find . -type f -name .gitignore -print -delete
@@ -225,7 +227,7 @@ export MORPHIO_CMAKE_DEFS="${mcd-}"
 %check
 %if %{with tests}
 # From ci/cpp_test.sh
-%ctest -VV
+%ctest --extra-verbose
 %endif
 %if %{with pytests}
 # We will change directories so that the “un-built” package is not imported
@@ -276,7 +278,7 @@ k="${k} and not test_mitochondria"
 k="${k} and not test_mitochondria_read"
 # TODO: pytest segfaults while writing a temporary file..
 k="${k} and not test_dendritic_spine_round_trip_empty_postsynaptic_density"
-%pytest "${xdir}/tests" -k "${k}" -v
+%pytest "${xdir}/tests" -k "${k}" --verbose
 %endif
 
 

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

only message in thread, other threads:[~2026-09-09  5:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-09  5:36 [rpms/morphio] rawhide: Use various long options 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