Accepting request 941914 from home:dimstar:Factory

- Fix name of gtk4 flavor generated packages (was ibus-gtk4-gtk4).

OBS-URL: https://build.opensuse.org/request/show/941914
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=259

ibus.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 21 14:51:48 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix name of gtk4 flavor generated packages (was ibus-gtk4-gtk4).
+
 -------------------------------------------------------------------
 Thu Dec 16 11:25:07 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 

ibus.spec

@@ -24,7 +24,7 @@
 
 %if "%{flavor}" == "gtk4"
 %define with_gtk4 1
-%define nsuffix -%{flavor}
+%define nsuffix _%{flavor}
 %endif
 
 %if ! %{defined _distconfdir}
@@ -195,7 +195,7 @@ docs for ibus.
 
 %else
 
-%package gtk4
+%package -n %{_name}-gtk4
 Summary:        IBus input method support for gtk4 applications
 # on 15.4, both gtk4-devel and gtk4-devel-32bit provide pkgconfig(gtk4)
 Group:          System/I18n/Chinese
@@ -205,7 +205,7 @@ Requires:       %{_name} = %{version}
 Supplements:    (ibus and gtk4)
 %{gtk4_immodule_requires}
 
-%description gtk4
+%description -n %{_name}-gtk4
 This package contains ibus im module for use by gtk4.
 %endif
 
@@ -348,10 +348,10 @@ rm -rf %{buildroot}%{_libdir}/ibus
 rm -rf %{buildroot}%{_libdir}/libibus*
 rm -rf %{buildroot}%{_libdir}/pkgconfig
 
-%post gtk4
+%post -n %{_name}-gtk4
 %{gtk4_immodule_post}
 
-%postun gtk4
+%postun -n %{_name}-gtk4
 #{gtk4_immodule_postun} there is a syntax error in the macro from gtk4-devel
 if [ $1 -eq 0 ]; then
   if [[ -x %{_bindir}/gio-querymodules-64 ]]; then
@@ -450,7 +450,7 @@ fi
 
 %else
 
-%files gtk4
+%files -n %{_name}-gtk4
 %dir %{_libdir}/gtk-4.0/4.0.0/immodules
 %{_libdir}/gtk-4.0/4.0.0/immodules/libim-ibus.so
 %endif