From f5198f063037424342a63a8b074b278d278b2aeaaafdbbdb3265d83d458c025d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Tue, 22 Feb 2022 09:51:06 +0000
Subject: [PATCH] Accepting request 956650 from GNOME:Next

- Update to version 41.0:
  + Allow adding comments when uploading to l10n.gnome.org.
  + Updated translations.
- Drop patch fixed upstream: libgda-6.patch

OBS-URL: https://build.opensuse.org/request/show/956650
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=80
---
 gtranslator-40.0.tar.xz |  3 ---
 gtranslator-41.0.tar.xz |  3 +++
 gtranslator.changes     |  8 +++++++
 gtranslator.spec        |  6 ++---
 libgda-6.patch          | 53 -----------------------------------------
 5 files changed, 13 insertions(+), 60 deletions(-)
 delete mode 100644 gtranslator-40.0.tar.xz
 create mode 100644 gtranslator-41.0.tar.xz
 delete mode 100644 libgda-6.patch

diff --git a/gtranslator-40.0.tar.xz b/gtranslator-40.0.tar.xz
deleted file mode 100644
index af662cd..0000000
--- a/gtranslator-40.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ec3eba36dee1c549377d1475aef71748dbaebd295005e1990ea9821f02b38834
-size 1509940
diff --git a/gtranslator-41.0.tar.xz b/gtranslator-41.0.tar.xz
new file mode 100644
index 0000000..ad083ed
--- /dev/null
+++ b/gtranslator-41.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:136f11fe03a194990c43afe338bd1ea0ad14e7e1f6e868e5bf7c5b52c4c5e5e1
+size 1521432
diff --git a/gtranslator.changes b/gtranslator.changes
index 1da8543..bcbea8a 100644
--- a/gtranslator.changes
+++ b/gtranslator.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 22 08:41:29 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 41.0:
+  + Allow adding comments when uploading to l10n.gnome.org.
+  + Updated translations.
+- Drop patch fixed upstream: libgda-6.patch
+
 -------------------------------------------------------------------
 Wed Feb  2 17:08:41 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gtranslator.spec b/gtranslator.spec
index c0e8d0f..24f69a2 100644
--- a/gtranslator.spec
+++ b/gtranslator.spec
@@ -17,16 +17,14 @@
 
 
 Name:           gtranslator
-Version:        40.0
+Version:        41.0
 Release:        0
 Summary:        A gettext po file editor for the GNOME desktop
 License:        GPL-3.0-or-later
 Group:          Development/Tools/Other
 URL:            https://wiki.gnome.org/Apps/Gtranslator
-Source0:        https://download.gnome.org/sources/gtranslator/40/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gtranslator/41/%{name}-%{version}.tar.xz
 Source99:       gtranslator-rpmlintrc
-# PATCH-FIX-UPSTREAM libgda-6.patch gmbr3@opensuse.org -- Require and support GDA 6
-Patch0:         libgda-6.patch
 # PATCH-FIX-UPSTREAM 7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch -- Fix build with meson 0.61 and newer
 Patch1:         https://gitlab.gnome.org/GNOME/gtranslator/-/commit/7ac572cc8c8c37ca3826ecf0d395edd3c38e8e22.patch
 
diff --git a/libgda-6.patch b/libgda-6.patch
deleted file mode 100644
index 08b79cc..0000000
--- a/libgda-6.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3764a9c0c5f33ff07a3c08664f945a526d12bfa1 Mon Sep 17 00:00:00 2001
-From: Callum Farmer <gmbr3@opensuse.org>
-Date: Mon, 29 Mar 2021 16:46:10 +0100
-Subject: [PATCH] Bump gda dependency to 6.0
-
----
- build-aux/flatpak/org.gnome.Gtranslator.json | 8 ++++----
- meson.build                                  | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build-aux/flatpak/org.gnome.Gtranslator.json b/build-aux/flatpak/org.gnome.Gtranslator.json
-index 65cb5082..b726a69e 100644
---- a/build-aux/flatpak/org.gnome.Gtranslator.json
-+++ b/build-aux/flatpak/org.gnome.Gtranslator.json
-@@ -76,9 +76,9 @@
-         },
-         {
-             "name": "libgda",
-+            "buildsystem": "meson",
-             "config-opts": [
--                "--enable-json=yes",
--                "--enable-system-sqlite=yes"
-+                "-Djson=true"
-             ],
-             "build-options" : {
-                 "env" : {
-@@ -89,8 +89,8 @@
-             "sources": [
-                 {
-                     "type": "archive",
--                    "url": "http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-5.2.9.tar.xz",
--                    "sha256": "59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b"
-+                    "url": "http://ftp.gnome.org/pub/GNOME/sources/libgda/6.0/libgda-6.0.0.tar.xz",
-+                    "sha256": "995f4b420e666da5c8bac9faf55e7aedbe3789c525d634720a53be3ccf27a670"
-                 }
-             ],
-             "modules": [
-diff --git a/meson.build b/meson.build
-index 94734ce2..021ac296 100644
---- a/meson.build
-+++ b/meson.build
-@@ -109,7 +109,7 @@ gtr_deps = [
-   gtk_dep,
-   libhandy_dep,
-   dependency('libdazzle-1.0', version: '>= 3.33.90'),
--  dependency('libgda-5.0'),
-+  dependency('libgda-6.0'),
-   dependency('gio-2.0', version: '>= 2.36.0'),
-   dependency('gsettings-desktop-schemas'),
-   dependency('gspell-1', version: '>= 1.2.0'),
--- 
-GitLab
-