[rpms/glib2] cve-2026-58016-f44: fix merge

[rpms/glib2] cve-2026-58016-f44: fix merge

[Peter Robinson]

A new commit has been pushed.

Repo   : rpms/glib2
Branch : cve-2026-58016-f44
Commit : 5d3325eaaf7903a707b7b7840b0dfea0e0a67ab9
Author : Peter Robinson <pbrobinson@gmail.com>
Date   : 2012-04-18T17:36:51+01:00
Stats  : +7/-85 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/glib2/c/5d3325eaaf7903a707b7b7840b0dfea0e0a67ab9?branch=cve-2026-58016-f44

Log:
fix merge

---
diff --git a/.gitignore b/.gitignore
index 00e6cea..526b2e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +1 @@
-glib-2.25.11.tar.bz2
-glib-2.25.12.tar.bz2
-glib-2.25.13.tar.bz2
-/glib-2.25.14.tar.bz2
-/glib-2.25.15.tar.bz2
-/glib-2.27.0.tar.bz2
-/glib-2.27.2.tar.bz2
-/glib-2.27.3.tar.bz2
-/glib-2.27.4.tar.bz2
-/glib-2.27.90.tar.bz2
-/glib-2.27.91.tar.gz
-/glib-2.27.92.tar.bz2
-/glib-2.27.93.tar.gz
-/glib-2.28.0.tar.bz2
-/glib-2.28.1.tar.bz2
-/glib-2.28.2.tar.bz2
-/glib-2.28.3.tar.bz2
-/glib-2.28.4.tar.bz2
-/glib-2.28.5.tar.bz2
-/glib-2.28.6.tar.bz2
-/glib-2.29.4.tar.bz2
-/glib-2.29.6.tar.xz
-/glib-2.29.8.tar.xz
-/glib-2.29.10.tar.xz
-/glib-2.29.14.tar.xz
-/glib-2.29.16.tar.xz
-/glib-2.29.18.tar.xz
-/glib-2.29.90.tar.xz
-/glib-2.29.92.tar.xz
-/glib-2.30.0.tar.xz
-/glib-2.30.1.tar.xz
-/glib-2.31.0.tar.xz
-/glib-2.31.2.tar.xz
-/glib-2.31.6.tar.xz
-/glib-2.31.10.tar.xz
-/glib-2.31.12.tar.xz
-/glib-2.31.16.tar.xz
-/glib-2.31.18.tar.xz
-/glib-2.31.20.tar.xz
-/glib-2.31.22.tar.xz
-/glib-2.32.0.tar.xz
+/glib-2.*.tar.xz

diff --git a/glib2.spec b/glib2.spec
index f81fa58..bf9b690 100644
--- a/glib2.spec
+++ b/glib2.spec
@@ -1,6 +1,6 @@
 Summary: A library of handy utility functions
 Name: glib2
-Version: 2.32.0
+Version: 2.32.1
 Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
@@ -160,6 +160,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %{_libdir}/lib*.a
 
 %changelog
+* Fri Apr 13 2012 Matthias Clasen <mclasen@redhat.com> 2.32.1-1
+- Update to 2.32.1
+
 * Tue Mar 27 2012 Matthias Clasen <mclasen@redhat.com> 2.32.0-1
 - Update to 2.32.0
 

diff --git a/sources b/sources
index 34e042a..417e466 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5fa76fbf9184d20dfb04af66b598190  glib-2.32.0.tar.xz
+032c7cf9868c9aa186b490b155a41144  glib-2.32.1.tar.xz

diff --git a/.gitignore b/.gitignore
index eebeb2b..526b2e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,42 +1 @@
-glib-2.25.11.tar.bz2
-glib-2.25.12.tar.bz2
-glib-2.25.13.tar.bz2
-/glib-2.25.14.tar.bz2
-/glib-2.25.15.tar.bz2
-/glib-2.27.0.tar.bz2
-/glib-2.27.2.tar.bz2
-/glib-2.27.3.tar.bz2
-/glib-2.27.4.tar.bz2
-/glib-2.27.90.tar.bz2
-/glib-2.27.91.tar.gz
-/glib-2.27.92.tar.bz2
-/glib-2.27.93.tar.gz
-/glib-2.28.0.tar.bz2
-/glib-2.28.1.tar.bz2
-/glib-2.28.2.tar.bz2
-/glib-2.28.3.tar.bz2
-/glib-2.28.4.tar.bz2
-/glib-2.28.5.tar.bz2
-/glib-2.28.6.tar.bz2
-/glib-2.29.4.tar.bz2
-/glib-2.29.6.tar.xz
-/glib-2.29.8.tar.xz
-/glib-2.29.10.tar.xz
-/glib-2.29.14.tar.xz
-/glib-2.29.16.tar.xz
-/glib-2.29.18.tar.xz
-/glib-2.29.90.tar.xz
-/glib-2.29.92.tar.xz
-/glib-2.30.0.tar.xz
-/glib-2.30.1.tar.xz
-/glib-2.31.0.tar.xz
-/glib-2.31.2.tar.xz
-/glib-2.31.6.tar.xz
-/glib-2.31.10.tar.xz
-/glib-2.31.12.tar.xz
-/glib-2.31.16.tar.xz
-/glib-2.31.18.tar.xz
-/glib-2.31.20.tar.xz
-/glib-2.31.22.tar.xz
-/glib-2.32.0.tar.xz
-/glib-2.32.1.tar.xz
+/glib-2.*.tar.xz