Slim down the gtk4 subpackages

There is currently no separate GTK 4 introspection support, so drop it.
Additionally, make the -gtk4-devel subpackage depend on the base (gtk3)
-devel subpackage, and keep a single copy of the headers and
documentation there.
This commit is contained in:
David King 2022-02-16 08:29:50 +00:00
parent f77a80a433
commit 97466d6df6

View File

@ -38,18 +38,19 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Files for development with %{name}.
%package -n colord-gtk4
Summary: GTK+ 4 support library for colord
Summary: GTK 4 support library for colord
%description -n colord-gtk4
colord-gtk is a support library for colord and provides additional
functionality that requires GTK+. This package contains the GTK+ 4
functionality that requires GTK. This package contains the GTK 4
build of colord-gtk.
%package -n colord-gtk4-devel
Summary: Development package for colord-gtk4
Summary: Development package for colord-gtk4
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description -n colord-gtk4-devel
Files for GTK+ 4 development with %{name}4.
Files for GTK 4 development with %{name}4.
%prep
%autosetup -p1
@ -74,7 +75,6 @@ Files for GTK+ 4 development with %{name}4.
%files -n colord-gtk4
%{_libdir}/libcolord-gtk4.so.*
%{_libdir}/girepository-1.0/ColordGtk-1.0.typelib
%files devel
%{_libdir}/libcolord-gtk.so
@ -94,17 +94,7 @@ Files for GTK+ 4 development with %{name}4.
%files -n colord-gtk4-devel
%{_libdir}/libcolord-gtk4.so
%{_libdir}/pkgconfig/colord-gtk4.pc
%dir %{_includedir}/colord-1
%{_includedir}/colord-1/colord-gtk.h
%dir %{_includedir}/colord-1/colord-gtk
%{_includedir}/colord-1/colord-gtk/*.h
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/ColordGtk-1.0.gir
%doc %{_datadir}/gtk-doc/html/colord-gtk
%{_datadir}/vala/vapi/colord-gtk.vapi
%{_datadir}/vala/vapi/colord-gtk.deps
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
# Requires the base -devel package for headers. No GTK 4 .gir nor VAPI yet.
%changelog