From 6ec912764f7b51db50fa25bc6b63347272e79068 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 23:47:58 +0100
Subject: [PATCH] libibus: don't require ibus so that it doesn't get install in
 default desktops add gtk2, gtk3 and wayland subpackages [release
 1.5.26-2mamba;Fri Jun 24 2022]

---
 ibus.spec | 64 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/ibus.spec b/ibus.spec
index 88ad360..4184170 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -1,6 +1,6 @@
 Name:          ibus
 Version:       1.5.26
-Release:       1mamba
+Release:       2mamba
 Summary:       Intelligent Input Bus for Linux / Unix OS
 Group:         System/Servers
 Vendor:        openmamba
@@ -53,6 +53,9 @@ BuildRequires: cldr-emoji-annotation
 BuildRequires: python
 BuildRequires: python3
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-gtk2 = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-gtk3 = %{?epoch:%epoch:}%{version}-%{release}
+Requires:      %{name}-wayland = %{?epoch:%epoch:}%{version}-%{release}
 
 %description
 Intelligent Input Bus for Linux / Unix OS.
@@ -60,11 +63,35 @@ Intelligent Input Bus for Linux / Unix OS.
 %package -n lib%{name}
 Group:         System/Libraries
 Summary:       Shared libraries for %{name}
-Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
+#Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description -n lib%{name}
 This package contains shared libraries for %{name}.
 
+%package gtk2
+Group:         System/Libraries
+Summary:       Gtk2 bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description gtk2
+Gtk2 bindings for %{name}.
+
+%package gtk3
+Group:         System/Libraries
+Summary:       Gtk2 bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description gtk3
+Gtk3 bindings for %{name}.
+
+%package wayland
+Group:         System/Libraries
+Summary:       Wayland bindings for %{name}
+Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description wayland
+Wayland bindings for %{name}.
+
 %package -n python-ibus
 Group:         System/Libraries
 Summary:       Python bindings for %{name}
@@ -113,7 +140,8 @@ This package includes the %{name} API documentation.
 sed -i "s|/usr/bin/python$|%{__python3}|" engine/gensimple.py
 
 %ifarch arm
-sed -i "s|umount|#umount|" data/dconf/make-dconf-override-db.sh
+# 1.5.26: workaround
+sed -i "s|umount|: #umount|" data/dconf/make-dconf-override-db.sh
 %endif
 
 %build
@@ -165,8 +193,14 @@ fi
 %{_bindir}/ibus-setup
 %{_userunitdir}/org.freedesktop.IBus.session.*.service
 %{_userunitdir}/gnome-session.target.wants/org.freedesktop.IBus.session.GNOME.service
+%{_libexecdir}/ibus-engine-simple
+%{_libexecdir}/ibus-dconf
+%{_libexecdir}/ibus-portal
+%{_libexecdir}/ibus-extension-gtk3
+%{_libexecdir}/ibus-ui-emojier
+%{_libexecdir}/ibus-ui-gtk3
+%{_libexecdir}/ibus-x11
 %{_datadir}/bash-completion/completions/ibus.bash
-%{_datadir}/gir-1.0/IBus-1.0.gir
 %dir %{_datadir}/ibus
 %dir %{_datadir}/ibus/component
 %{_datadir}/ibus/component/*.xml
@@ -203,14 +237,23 @@ fi
 
 %files -n lib%{name}
 %defattr(-,root,root)
+%{_libdir}/libibus-1.0.so.*
+%{_libdir}/girepository-1.0/IBus-1.0.typelib
+%doc AUTHORS COPYING
+
+%files gtk2
+%defattr(-,root,root)
 %{_libdir}/gtk-2.0/2.10.0/immodules/im-ibus.la
 %{_libdir}/gtk-2.0/2.10.0/immodules/im-ibus.so
+
+%files gtk3
+%defattr(-,root,root)
 %{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.la
 %{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
-%{_libdir}/girepository-1.0/IBus-1.0.typelib
-%{_libdir}/libibus-1.0.so.*
-%{_libexecdir}/ibus-*
-%doc AUTHORS COPYING
+	
+%files wayland
+%defattr(-,root,root)
+%{_libexecdir}/ibus-wayland
 
 %files -n lib%{name}-devel
 %defattr(-,root,root)
@@ -218,6 +261,7 @@ fi
 %{_includedir}/ibus-1.0/*.h
 %{_libdir}/libibus-1.0.la
 %{_libdir}/libibus-1.0.so
+%{_datadir}/gir-1.0/IBus-1.0.gir
 %{_datadir}/vala/vapi/ibus-1.0.deps
 %{_datadir}/vala/vapi/ibus-1.0.vapi
 %{_libdir}/pkgconfig/ibus-1.0.pc
@@ -229,6 +273,10 @@ fi
 %{_datadir}/gtk-doc/html/ibus/*
 
 %changelog
+* Fri Jun 24 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.5.26-2mamba
+- libibus: don't require ibus so that it doesn't get install in default desktops
+- add gtk2, gtk3 and wayland subpackages
+
 * Sat Jun 04 2022 Automatic Build System <autodist@mambasoft.it> 1.5.26-1mamba
 - automatic version update by autodist