diff --git a/baselibs.conf b/baselibs.conf index 59c4138..8752160 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,4 @@ gstreamer + +/usr/lib/gstreamer-.*/gst-plugin-scanner-.* libgstreamer-1_0-0 + requires "gstreamer-" diff --git a/gstreamer.changes b/gstreamer.changes index a85d9cb..ce7ddbc 100644 --- a/gstreamer.changes +++ b/gstreamer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 23 12:42:34 UTC 2018 - dimstar@opensuse.org + +- Rename gst-plugin-scanner to gst-plugin-scanner-%{arch}, allowing + multiple variants to co-exist (boo#1049452). + ------------------------------------------------------------------- Thu Mar 29 11:58:37 UTC 2018 - bjorn.lie@gmail.com diff --git a/gstreamer.spec b/gstreamer.spec index 7bcd58c..96f2072 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -157,7 +157,9 @@ export PYTHON=%{_bindir}/python3 --disable-benchmarks \ --disable-examples \ --disable-static \ - --disable-tests + --disable-tests \ + --program-transform-name='s/gst-plugin-scanner/gst-plugin-scanner-%{_target_cpu}/' +sed -i 's/gst-plugin-scanner/gst-plugin-scanner-%{_target_cpu}/' config.h make %{?_smp_mflags} %install @@ -188,7 +190,7 @@ install -m755 -D %{SOURCE2} %{buildroot}%{_libexecdir}/rpm/gstreamer-provides %{_libdir}/gstreamer-%{gst_branch}/libgstcoretracers.so %dir %{_libexecdir}/gstreamer-%{gst_branch} %{_libexecdir}/gstreamer-%{gst_branch}/gst-completion-helper -%{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner +%{_libexecdir}/gstreamer-%{gst_branch}/gst-plugin-scanner-%{_target_cpu} %verify(not mode caps) %{_libexecdir}/gstreamer-%{gst_branch}/gst-ptp-helper %{_datadir}/bash-completion/completions/ %{_datadir}/bash-completion/helpers/