From a8a6072c5de4ceb6b12dbbdd14c315c134b9c57b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 26 Aug 2022 15:47:49 +0200 Subject: [PATCH] Move GObject Introspection bindings to -gtk and -gtk-devel subpackages ... so it's packaged the same way as we package all of GNOME libraries. --- zbar.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/zbar.spec b/zbar.spec index d52240b..7617543 100644 --- a/zbar.spec +++ b/zbar.spec @@ -53,20 +53,13 @@ developing applications that read bar codes with this library. %package gtk Summary: Bar code reader GTK widget Requires: %{name} = %{version}-%{release} +# Obsoleted in F37 +Obsoletes: %{name}-gi < %{version}-%{release} %description gtk This package contains a bar code scanning widget for use with GUI applications based on GTK+-2.0. -%package gi -Summary: Bar code reader GObject Introspection (GIR) Gtk bindings -Requires: %{name}-gtk = %{version}-%{release} - -%description gi -This package contains a bar code scanning GObject Introspection -(GIR) Gtk bindings, with allow the usage of ZBar with GUI -support on any application compatible with GIR, like python3. - %package gtk-devel Summary: Bar code reader GTK widget extra development files Requires: %{name}-devel = %{version}-%{release} @@ -189,17 +182,15 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %files gtk %{_libdir}/libzbargtk.so.* %{_bindir}/zbarcam-gtk - -%files gi %dir %{_libdir}/girepository-1.0 -%dir %{_datadir}/gir-1.0 %{_libdir}/girepository-1.0/ZBar-1.0.typelib -%{_datadir}/gir-1.0/ZBar-1.0.gir %files gtk-devel %{_libdir}/libzbargtk.so %{_libdir}/pkgconfig/zbar-gtk.pc %{_includedir}/zbar/zbargtk.h +%dir %{_datadir}/gir-1.0 +%{_datadir}/gir-1.0/ZBar-1.0.gir %files qt %{_libdir}/libzbarqt.so.* @@ -223,6 +214,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/zbar-%{version}/ %changelog * Fri Aug 26 2022 Kalev Lember - 0.23.90-5 - Sort BuildRequires and Requires and split them out one per line +- Move GObject Introspection bindings to -gtk and -gtk-devel subpackages * Mon Aug 01 2022 Gwyn Ciesla - 0.23.90-4 - Only build Java on supported platforms.