From 3346b97d9f754fe91f7375b9a50fc68fc5a194743e649e341314a4d7a06925b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 19 Apr 2023 08:45:11 +0000
Subject: [PATCH] Accepting request 1080198 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/1080198
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=125
---
 gtk4-rpmlintrc |  5 ++++-
 gtk4.changes   | 10 ++++++++++
 gtk4.spec      | 13 +++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/gtk4-rpmlintrc b/gtk4-rpmlintrc
index 40ce693..0137ae5 100644
--- a/gtk4-rpmlintrc
+++ b/gtk4-rpmlintrc
@@ -1 +1,4 @@
-addFilter("shlib-policy-name-error");
+# We're keeping English locales in the tools sub-packages instead of lang.
+# English should be offered to everybody by default, without installing lang
+# packages.
+addFilter("file-not-in-%lang");
diff --git a/gtk4.changes b/gtk4.changes
index 8b3590f..7c1f16d 100644
--- a/gtk4.changes
+++ b/gtk4.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Apr 12 21:31:38 UTC 2023 - Luciano Santos <luc14n0@opensuse.org>
+
+- Place English translations in the tools sub-package instead of
+  lang. This should offer translations for the main English locales
+  without the need to install any additional package by default.
+- Add "file-not-in-%lang" RPM Lint warning to rpmlintrc file for
+  the reason above.
+- Drop "shlib-policy-name-error" unused filter from rpmlintrc.
+
 -------------------------------------------------------------------
 Sun Apr  2 23:07:59 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gtk4.spec b/gtk4.spec
index 49ae011..a94f077 100644
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -253,7 +253,6 @@ This package enhances gettext with an International Tag Set for GTK+ 4
 
 %build
 %meson \
-	-Dbuild-tests=false \
 	-Dgtk_doc=true \
 	-Dbroadway-backend=true \
 	-Dcloudproviders=enabled \
@@ -273,7 +272,7 @@ This package enhances gettext with an International Tag Set for GTK+ 4
 %install
 %meson_install
 
-%find_lang gtk40
+%find_lang gtk40 %{?no_lang_C}
 install -m 644 -D %{SOURCE2} %{buildroot}%{_datadir}/gtk-4.0/settings.ini
 # create modules directory that should have been created during the build
 if test ! -d %{buildroot}%{_libdir}/gtk-4.0/modules; then
@@ -343,6 +342,11 @@ cp %{SOURCE3} %{buildroot}%{_rpmmacrodir}
 %{_mandir}/man1/gtk4-launch.1%{?ext_man}
 %{_mandir}/man1/gtk4-query-settings.1%{?ext_man}
 %{_mandir}/man1/gtk4-update-icon-cache.1%{?ext_man}
+# English should be offered to every installation by default.
+%{_datadir}/locale/en/
+%{_datadir}/locale/en_GB/
+%{_datadir}/locale/en@shaw/
+%{_datadir}/locale/en_CA/
 
 %files devel-tools
 %{_bindir}/gtk4-builder-tool
@@ -424,5 +428,10 @@ cp %{SOURCE3} %{buildroot}%{_rpmmacrodir}
 %{_datadir}/gettext/its/gtk4builder.loc
 
 %files lang -f gtk40.lang
+# Those shouldn't be here in the first place.
+%exclude %{_datadir}/locale/en/
+%exclude %{_datadir}/locale/en_GB/
+%exclude %{_datadir}/locale/en@shaw/
+%exclude %{_datadir}/locale/en_CA/
 
 %changelog