.gitignore

@@ -1 +1 @@
-SOURCES/libXres-1.2.0.tar.bz2
+SOURCES/libXres-1.2.2.tar.xz

.libXres.metadata

@@ -1 +1 @@
-b6996ab05460a3b7311f02da23ddf117a5442fd9 SOURCES/libXres-1.2.0.tar.bz2
+0a467b6fec6121da45125b7258cfde3002e10c4d SOURCES/libXres-1.2.2.tar.xz

SOURCES/0001-XRes-Use-_XRead-instead-of-_XRead32-for-reading-pid.patch

@@ -1,33 +0,0 @@
-From 3e6bdd90c604e061c71715865eb403ffdd0dd7f0 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Wed, 21 Oct 2020 10:03:23 -0400
-Subject: [PATCH] XRes: Use _XRead instead of _XRead32 for reading pid
-
-_XRead32 requires the output variable to be a long, but
-`ReadClientValues` feeds it client->value which is a
-32-bit allocation.
-
-This commit changes the code to use _XRead instead, which
-properly handles 32-bit output variables.
-
-https://gitlab.freedesktop.org/xorg/lib/libxres/-/issues/3
----
- src/XRes.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/XRes.c b/src/XRes.c
-index 2bee277..90e72c9 100644
---- a/src/XRes.c
-+++ b/src/XRes.c
-@@ -256,7 +256,7 @@ static Bool ReadClientValues(
-         _XRead32 (dpy, &value, 4);
-         client->length = value;
-         client->value = malloc(client->length);
--        _XRead32 (dpy, client->value, client->length);
-+        _XRead (dpy, client->value, client->length);
-     }
-     return True;
- }
--- 
-2.28.0
-

SPECS/libXres.spec

@@ -4,23 +4,22 @@
 
 Summary: X-Resource extension client library
 Name: libXres
-Version: 1.2.0
-Release: 14%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
-License: MIT
+Version: 1.2.2
+Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+License: X11
 URL: http://www.x.org
 
 %if 0%{?gitdate}
-Source0:    %{tarball}-%{gitdate}.tar.bz2
+Source0:    %{tarball}-%{gitdate}.tar.xz
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 %else
-Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz
 %endif
 # Fixes a bug which causes metacity 3.38.0+ to crash on startup:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1888993
 # https://gitlab.freedesktop.org/xorg/lib/libxres/-/issues/3
 # https://gitlab.freedesktop.org/xorg/lib/libxres/-/merge_requests/1
-Patch0: 0001-XRes-Use-_XRead-instead-of-_XRead32-for-reading-pid.patch
 
 Requires: libX11 >= 1.5.99.902
 
@@ -43,7 +42,6 @@ X.Org X11 libXres development package
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch0 -p1
 
 %build
 autoreconf -v --install --force
@@ -73,12 +71,42 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.3*
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-14
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.2-5
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-13
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.2-4
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Oct 05 2023 José Expósito <jexposit@redhat.com> - 1.2.2-1
+- libXres 1.2.2
+
+* Wed Sep 06 2023 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 1.2.1-6
+- SPDX Migration
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Sep 21 2021 Benjamin Tissoires <benjamin.tissoires@redhat.com> 1.2.1-1
+- libXres 1.2.1
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild