From 76559f4279ae943de97af21a8a5e22553751815935a2cf3e24df8cacbd602b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 23 Dec 2020 14:19:20 +0000
Subject: [PATCH] Accepting request 858202 from GNOME:Next

New stable release

OBS-URL: https://build.opensuse.org/request/show/858202
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=287
---
 _service              |  5 +++++
 _servicedata          |  6 ------
 gtk-2.24.32+70.tar.xz |  3 ---
 gtk-2.24.33.tar.xz    |  3 +++
 gtk2.changes          | 14 ++++++++++++++
 gtk2.spec             |  2 +-
 6 files changed, 23 insertions(+), 10 deletions(-)
 delete mode 100644 _servicedata
 delete mode 100644 gtk-2.24.32+70.tar.xz
 create mode 100644 gtk-2.24.33.tar.xz

diff --git a/_service b/_service
index ee34c40..5259d51 100644
--- a/_service
+++ b/_service
@@ -1,10 +1,15 @@
+<?xml version="1.0"?>
 <services>
   <service mode="disabled" name="tar_scm">
     <param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
     <param name="scm">git</param>
     <param name="revision">gtk-2-24</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
+<!--
     <param name="changesgenerate">enable</param>
+-->
   </service>
   <service mode="disabled" name="recompress">
     <param name="file">*.tar</param>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 3dae9ea..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,6 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">git://git.gnome.org/gtk+</param>
-              <param name="changesrevision">ed7d3e25f8b6debae6ccc8b50d1329155338cab8</param></service><service name="tar_scm">
-                <param name="url">https://gitlab.gnome.org/GNOME/gtk.git</param>
-              <param name="changesrevision">d1b21ff1598cfab03e6b918edd76de766356566c</param></service></servicedata>
\ No newline at end of file
diff --git a/gtk-2.24.32+70.tar.xz b/gtk-2.24.32+70.tar.xz
deleted file mode 100644
index 63bd209..0000000
--- a/gtk-2.24.32+70.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5318cbcd8a1eb8ecdd47e8ddb564edb9fd1c1dfc6c9d98a102d684c7a60041ad
-size 9093080
diff --git a/gtk-2.24.33.tar.xz b/gtk-2.24.33.tar.xz
new file mode 100644
index 0000000..c74d87c
--- /dev/null
+++ b/gtk-2.24.33.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fab562c9621db16c33e8933ee09e50716600b0fed887790e32b7491a3197de8
+size 9202552
diff --git a/gtk2.changes b/gtk2.changes
index 9d4dab9..015ef4f 100644
--- a/gtk2.changes
+++ b/gtk2.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Dec 22 16:59:43 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 2.24.33:
+  + This is the final GTK 2.x release. There will be no more
+    updates to GTK 2. All users are encouraged to update to GTK 3
+    or 4.
+  + Make the output of gtk-query-immodules deterministic.
+  + GtkCalendar: Use %OB if supported.
+  + GtkIconTheme: prefer exact matches.
+  + build:
+    - Support automake 1.16.
+    - Fix compiler warnings with newer gcc.
+
 -------------------------------------------------------------------
 Sun Jul 12 12:26:32 UTC 2020 - bjorn.lie@gmail.com
 
diff --git a/gtk2.spec b/gtk2.spec
index e25392f..4ec93b5 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -20,7 +20,7 @@
 %define gtk_binary_version 2.10.0
 %define _name gtk
 Name:           gtk2
-Version:        2.24.32+70
+Version:        2.24.33
 Release:        0
 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer)
 Summary:        The GTK+ toolkit library (version 2)