From a1645b0c55c190b6e3b90bba6b76cc43c79a405d19a0fc7635d8bdd2fc5ad40c Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 22 Aug 2018 13:02:44 +0000
Subject: [PATCH] Accepting request 630761 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/630761
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=34
---
 baselibs.conf |  2 +-
 gtk4.changes  |  5 +++++
 gtk4.spec     | 16 +++++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/baselibs.conf b/baselibs.conf
index ebb121a..657f03e 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -20,7 +20,7 @@ gtk4-immodule-thai
   requires "gtk4-<targettype>"
   post "<prefix>%{_bindir}/gtk4-query-immodules --update-cache"
   postun "<prefix>%{_bindir}/gtk4-query-immodules --update-cache"
-gtk4-immodules-tigrigna
+gtk4-immodule-tigrigna
   requires "gtk4-<targettype>"
   post "<prefix>%{_bindir}/gtk4-query-immodules --update-cache"
   postun "<prefix>%{_bindir}/gtk4-query-immodules --update-cache"
diff --git a/gtk4.changes b/gtk4.changes
index 6727a03..f81b2f4 100644
--- a/gtk4.changes
+++ b/gtk4.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
+
 -------------------------------------------------------------------
 Tue Mar 20 17:10:11 UTC 2018 - dimstar@opensuse.org
 
diff --git a/gtk4.spec b/gtk4.spec
index 3f42a30..d1be1cb 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -87,8 +87,8 @@ ranging from small one-off projects to complete application suites.
 
 %package -n libgtk-4-0
 Summary:        The GTK+ toolkit library (version 4)
-Group:          System/Libraries
 # gtk4-data is currently not being built, might be an upstream oversight though
+Group:          System/Libraries
 Requires:       %{name}-data >= %{version}
 Requires:       %{name}-schema >= %{version}
 # Require Adwaita Icon Theme: It's GTKs icon set, that's guaranteed to be there
@@ -205,15 +205,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 method for the GTK+ toolkit library v4
 Group:          System/Libraries
 Requires:       %{name} = %{version}
 Requires(post): %{name}-tools
 Requires(postun): %{name}-tools
+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.
@@ -274,8 +276,8 @@ ranging from small one-off projects to complete application suites.
 
 %package schema
 Summary:        Config schema for the GTK+ toolkit library v4
-Group:          System/Libraries
 # The schema is shared between gtk3 and gtk4 - gtk4 wins
+Group:          System/Libraries
 Provides:       gtk3-schema = %{version}
 Obsoletes:      gtk3-schema < %{version}
 BuildArch:      noarch
@@ -409,7 +411,7 @@ fi
 %post immodule-thai
 %{_gtk_query_immodules_update_cache}
 
-%post immodules-tigrigna
+%post immodule-tigrigna
 %{_gtk_query_immodules_update_cache}
 
 %post immodule-vietnamese
@@ -454,7 +456,7 @@ fi
 %postun immodule-thai
 %{_gtk_query_immodules_update_cache}
 
-%postun immodules-tigrigna
+%postun immodule-tigrigna
 %{_gtk_query_immodules_update_cache}
 
 %postun immodule-vietnamese
@@ -506,7 +508,7 @@ fi
 %files immodule-thai
 %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules/im-thai.so
 
-%files immodules-tigrigna
+%files immodule-tigrigna
 %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules/im-ti-er.so
 %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules/im-ti-et.so