Skip to content

fix(zbar): drop GIR typelib/gir file listings from %files sections #15972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reubeno merged 3 commits into from
Feb 26, 2026
Merged

fix(zbar): drop GIR typelib/gir file listings from %files sections #15972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7dffde
fix(zbar): drop GIR typelib/gir file listings from %files sections
dmcilvaney Feb 24, 2026
dfc1df2
scope regex replaces
dmcilvaney Feb 24, 2026
466147d
consolidate regex
dmcilvaney Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion base/comps/components-full.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3004,7 +3004,6 @@
[components.yelp-xsl]
[components.ypbind]
[components.z3]
[components.zbar]
[components.zeromq]
[components.zimg]
[components.zint]
Expand Down
26 changes: 26 additions & 0 deletions base/comps/zbar/zbar.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[components.zbar]

# Since GLib 2.80, gobject-introspection tools (g-ir-scanner) were merged into
# glib2 but the legacy tools still live in a separate package. The zbar configure
# script autodetects g-ir-scanner and won't generate typelibs without it, but the
# spec never explicitly BuildRequires it — it only worked by accident through
# transitive deps. Fedora dropped the GIR file listings in rawhide (release 10).
# We do the same: remove the typelib/gir entries from %files so the build doesn't
# fail when g-ir-scanner isn't present.
# Ref: https://src.fedoraproject.org/rpms/zbar/c/a1e97927fd862a8ca777462155b54c4ee4176923 ("Fix FTBFS")

[[components.zbar.overlays]]
description = "Remove GIR typelib entries from zbar-gtk %files (g-ir-scanner not available, aligns with Fedora rawhide)"
type = "spec-search-replace"
section = "%files"
package = "gtk"
regex = '%.*girepository-1\.0.*'
replacement = ""

[[components.zbar.overlays]]
description = "Remove GIR data entries from zbar-gtk-devel %files (g-ir-scanner not available, aligns with Fedora rawhide)"
type = "spec-search-replace"
section = "%files"
package = "gtk-devel"
regex = '%.*gir-1\.0.*'
replacement = ""