From f0fb00a64a79fab7b27c782afc0efda1a10cb4d4 Mon Sep 17 00:00:00 2001
From: Bill Kendrick <nbs@sonic.net>
Date: Sun, 26 Jun 2022 16:50:50 -0700
Subject: [PATCH 1/2] Stub for Android port changes in CHANGES.txt

(Pere and/or Terrence should fill in the details, e.g., things from
"Android tweaks coming from the Tuxpaint-Android repo at github [...]"
https://sourceforge.net/p/tuxpaint/tuxpaint/ci/31594dfa623849dd40894ef3f0b8f87ee85054dc/)
---
 docs/CHANGES.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index aefbfaa9b..512dc5860 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
 http://www.tuxpaint.org/
 
 
-2022.June.14 (0.9.29)
+2022.June.26 (0.9.29)
   * Bug Fixes:
     ----------
     * Opening and immediately dismissing Color Mixer could cause
@@ -56,6 +56,11 @@ http://www.tuxpaint.org/
       Richard Hughes <https://sourceforge.net/u/hughsie/profile/>
       and Will Thompson <https://sourceforge.net/u/wjjjjt/profile/>
 
+    * Various Android port updates
+      * FIXME: Pere & Terrence, can you enumerate them here???
+      Terrence Sheflin <terrence.sheflin@gmail.com>
+      Pere Pujal i Carabantes <perepujal@gmail.com>
+
   * Documentation updates:
     ---------------------
     * Update macOS build instructions for SDL2.0.

From bd1c8c024260b23e748890aa5dbfdcae9febc716 Mon Sep 17 00:00:00 2001
From: dolphin6k <dolphin6k@wmail.plala.or.jp>
Date: Wed, 29 Jun 2022 09:25:57 +0900
Subject: [PATCH 2/2] Set minimum version requirement for gettext for Appstream
 metainfo.

This stops support for RHEL6.
---
 tuxpaint.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tuxpaint.spec b/tuxpaint.spec
index d7c042a48..9476693f8 100644
--- a/tuxpaint.spec
+++ b/tuxpaint.spec
@@ -9,7 +9,7 @@ Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: SDL >= 1.2.4 SDL_image SDL_mixer SDL_ttf SDL_Pango SDL_gfx libpaper fribidi xdg-utils libimagequant
 BuildRequires: SDL-devel >= 1.2.4 SDL_image-devel SDL_mixer-devel SDL_ttf-devel SDL_Pango-devel SDL_gfx-devel
-BuildRequires: librsvg2-devel libpaper-devel fribidi-devel gperf gettext ImageMagick xdg-utils libimagequant-devel
+BuildRequires: librsvg2-devel libpaper-devel fribidi-devel gperf gettext >= 0.19.7 ImageMagick xdg-utils libimagequant-devel
 
 %description
 "Tux Paint" is a drawing program for young children.