fix(qt6-qtmultimedia): remove leftover GStreamer media plugin devel f…#17782
fix(qt6-qtmultimedia): remove leftover GStreamer media plugin devel f…#17782WithEnoughCoffee wants to merge 1 commit into
Conversation
There was a problem hiding this comment.
Pull request overview
This PR is a follow-up fix to PR #17652, which dropped the gstreamer-plugins-bad BuildRequires from qt6-qtmultimedia (so the GStreamer media backend plugin is no longer built) and cleaned up the runtime %files, but missed the matching %files devel entries for QtGstreamerMediaPluginImpl. Those dangling entries broke qt6-qtmultimedia-devel packaging. The change adds targeted overlays to the component definition to remove the stale devel artifacts and also fixes two additional fatal RPM errors surfaced in the same build.
Changes:
- Adds five
spec-search-replaceoverlays (scoped to%files/package = "devel") to remove theQtGstreamerMediaPluginImplheader dir,.a/.prlstatic libs, and the private cmake dir + cmake files that are no longer built. - Adds an overlay to drop a redundant bare
%dirforQtQuick3D/SpatialAudio(the trailing-slash entry already owns it) to fix the "File listed twice" error, and an overlay to strip an unescaped%{version}from a commented-outBuildRequiresto fix the "Macro expanded in comment" error. - Re-renders the spec (
Release4→5) and refreshes the lock file accordingly.
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
base/comps/qt6-qtmultimedia/qt6-qtmultimedia.comp.toml |
Adds 7 well-documented overlays removing stale GStreamer devel %files entries and fixing the duplicate %dir and macro-in-comment issues. |
specs/q/qt6-qtmultimedia/qt6-qtmultimedia.spec |
Regenerated rendered spec reflecting the overlays (removed devel entries, dropped redundant %dir, comment macro stripped, Release bumped to 5). |
locks/qt6-qtmultimedia.lock |
Updated input-fingerprint reflecting the new component config. |
tobiasb-ms
left a comment
tobiasb-ms
left a comment
There was a problem hiding this comment.
issue(blocking): Changes look good but please rebase this down to one commit -- they don't really make sense as separate commits.
WithEnoughCoffee
force-pushed
the
fix/qt6-qtmultimedia-devel-gstreamer-files
branch
from
31062cf to
a5aa537
Compare
Got that taken care of. |
…iles The gstreamer-plugins-bad BR drop stops the QtGstreamerMediaPluginImpl devel artifacts from being built, but the matching %files devel entries were missed, failing devel packaging. A single regex now drops every such entry.
WithEnoughCoffee
force-pushed
the
fix/qt6-qtmultimedia-devel-gstreamer-files
branch
from
a5aa537 to
26d8a53
Compare
PR #17652 dropped the gstreamer-plugins-bad BuildRequires (so the GStreamer media plugin is no longer built) and cleaned up the runtime %files, but the matching %files devel entries for QtGstreamerMediaPluginImpl were missed. This broke qt6-qtmultimedia-devel packaging. This PR removes those leftover devel %files entries to fix the build.
Note: an earlier revision of this PR also overlaid away a duplicate %dir for QtQuick3D/SpatialAudio ("File listed twice") and an unescaped %{version} in a comment ("Macro expanded in comment"). A full build confirmed both are only non-fatal RPM warnings, not errors, so those overlays were removed to minimize divergence from the Fedora spec.