Accepting request 628397 from home:scarabeus_iv:branches:GNOME:Factory

- Fix package name to be uniform immodules -> immodule bsc#1104264

OBS-URL: https://build.opensuse.org/request/show/628397
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=270

baselibs.conf

@@ -66,7 +66,7 @@ gtk2-immodule-thai
   postun "%else"
   postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 --update-cache"
   postun "%endif"
-gtk2-immodules-tigrigna
+gtk2-immodule-tigrigna
   requires "gtk2-<targettype>"
   post "%if "%_lib" == "lib64""
   post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 --update-cache"

gtk2.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug  9 11:33:37 UTC 2018 - tchvatal@suse.com
+
+- Fix package name to be uniform immodules -> immodule bsc#1104264
+
 -------------------------------------------------------------------
 Wed Apr 18 19:01:07 UTC 2018 - bjorn.lie@gmail.com
 

gtk2.spec

@@ -88,11 +88,11 @@ ranging from small one-off projects to complete application suites.
 
 %package -n libgtk-2_0-0
 Summary:        The GTK+ toolkit library (version 2)
-Group:          System/Libraries
 # While hicolor is not a Requires strictly speaking, we put it as
 # such instead of as a Recommends because many applications just
 # assume it's there and we need to have a low-level package to
 # bring it in.
+Group:          System/Libraries
 Requires:       hicolor-icon-theme
 Requires(post): %{name}-tools >= 2.24.20
 # gtk+ can work without branding/data/translations. Built in defaults will be used then.
@@ -191,15 +191,17 @@ ranging from small one-off projects to complete application suites.
 
 This package provides an input method for Thai-Lao.
 
-%package immodules-tigrigna
+%package immodule-tigrigna
 Summary:        Tigrigna input methods for the GTK+ toolkit library v2
 Group:          System/Libraries
 Requires:       %{name} = %{version}
 Requires(post): %{name}-tools >= 2.24.20
 Requires(postun): %{name}-tools >= 2.24.20
+Provides:       %{name}-immodules-tigrigna = %{version}
 Provides:       locale(%{name}:ti)
+Obsoletes:      %{name}-immodules-tigrigna < %{version}
 
-%description immodules-tigrigna
+%description immodule-tigrigna
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
 Offering a complete set of widgets, GTK+ is suitable for projects
 ranging from small one-off projects to complete application suites.
@@ -408,7 +410,7 @@ fi
 %post immodule-thai
 %{_gtk_query_immodules_update_cache}
 
-%post immodules-tigrigna
+%post immodule-tigrigna
 %{_gtk_query_immodules_update_cache}
 
 %post immodule-vietnamese
@@ -474,7 +476,7 @@ fi
 %postun immodule-thai
 %{_gtk_query_immodules_update_cache}
 
-%postun immodules-tigrigna
+%postun immodule-tigrigna
 %{_gtk_query_immodules_update_cache}
 
 %postun immodule-vietnamese
@@ -535,7 +537,7 @@ fi
 %files immodule-thai
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-thai.so
 
-%files immodules-tigrigna
+%files immodule-tigrigna
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ti-er.so
 %{_libdir}/gtk-2.0/%{gtk_binary_version}/immodules/im-ti-et.so