From 387456937a52d1837f2efe9df4cc1c72275eff0e Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Tue, 2 Apr 2024 16:08:03 -0700
Subject: [PATCH] backport changes from Fedora 40

Resolves: RHEL-31135
---
 .gitignore             |  1 +
 gnome-text-editor.spec | 12 ++++++++----
 sources                |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca6b08f..104a408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /gnome-text-editor-45.0.tar.xz
 /gnome-text-editor-45.1.tar.xz
 /gnome-text-editor-46.alpha.tar.xz
+/gnome-text-editor-46.0.tar.xz
diff --git a/gnome-text-editor.spec b/gnome-text-editor.spec
index 3d789bc..1fee65e 100644
--- a/gnome-text-editor.spec
+++ b/gnome-text-editor.spec
@@ -2,16 +2,17 @@
 %global gtk4_version 4.7
 %global gtksourceview_version 5.5.0
 %global enchant_version 2.2.0
-%global libadwaita_version 1.4~alpha
+%global libadwaita_version 1.5~alpha
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:		gnome-text-editor
-Version:	46~alpha
-Release:	3%{?dist}
+Version:	46.0
+Release:	1%{?dist}
 Summary:	A simple text editor for the GNOME desktop
 
-License:	GPL-3.0-or-later
+# Code is GPL-3.0-or-later and the Appdata is CC0-1.0
+License:	GPL-3.0-or-later AND CC0-1.0
 URL:		https://gitlab.gnome.org/GNOME/gnome-text-editor
 Source0:	https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz
 
@@ -75,6 +76,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.TextEditor.
 
 
 %changelog
+* Sat Mar 16 2024 David King <amigadave@amigadave.com> - 46.0-1
+- Update to 46.0
+
 * Wed Jan 31 2024 Pete Walter <pwalter@fedoraproject.org> - 46~alpha-3
 - Rebuild for ICU 74
 
diff --git a/sources b/sources
index f9ea814..8ffdc7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-text-editor-46.alpha.tar.xz) = 6e566c30952c25e724a8c41f42a9849b3405d2f451816f5f29631b7d727c7ca6baa06fe069bc1f5d6d3f2aff1fb5e8c7119df8974a2641845f18f1631c2f6a30
+SHA512 (gnome-text-editor-46.0.tar.xz) = a8a12ff16809dd42bd0916b3bfdd9f2a09b4bf1f1d04837cd81ad7d1fedf80cd6929e030f89c9619f15868ee7ba6a765ec95b8ac72c2efa9fe308732560b5746