.gitignore

@@ -1,6 +1 @@
-libXres-1.0.4.tar.bz2
-/libXres-1.0.5.tar.bz2
-/libXres-1.0.6.tar.bz2
-/libXres-20130524.tar.bz2
-/libXres-1.0.7.tar.bz2
-/libXres-1.2.0.tar.bz2
+SOURCES/libXres-1.2.0.tar.bz2

.libXres.metadata

@@ -0,0 +1 @@
+b6996ab05460a3b7311f02da23ddf117a5442fd9 SOURCES/libXres-1.2.0.tar.bz2

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

@@ -0,0 +1,33 @@
+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

@@ -5,9 +5,8 @@
 Summary: X-Resource extension client library
 Name: libXres
 Version: 1.2.0
-Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release: 14%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License: MIT
-Group: System Environment/Libraries
 URL: http://www.x.org
 
 %if 0%{?gitdate}
@@ -17,9 +16,15 @@ Source2:    commitid
 %else
 Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
 %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
 
+BuildRequires: make
 BuildRequires: xorg-x11-util-macros
 BuildRequires: autoconf automake libtool
 BuildRequires: pkgconfig(xext)
@@ -31,7 +36,6 @@ the X server about its usage of various resources.
 
 %package devel
 Summary: Development files for %{name}
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -39,6 +43,7 @@ X.Org X11 libXres development package
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch0 -p1
 
 %build
 autoreconf -v --install --force
@@ -68,6 +73,37 @@ 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
+
+* 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
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Nov  5 12:16:29 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.0-11
+- Add BuildRequires for make
+
+* Wed Oct 21 2020 Adam Williamson <awilliam@redhat.com> - 1.2.0-10
+- Backport upstream MR #1 to fix RHBZ #1888993 (metacity crash)
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.2.0-4
 - Drop useless %%defattr
 

commitid

@@ -1 +0,0 @@
-f468184963e53feda848853c4aefd0197b2cc116

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

make-git-snapshot.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=libXres-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/xorg/lib/libXRes $DIRNAME
-cd $DIRNAME
-if [ -z "$1" ]; then
-    git log | head -1
-else
-    git checkout $1
-fi
-git log | head -1 | awk '{ print $2 }' > ../commitid
-git repack -a -d
-cd ..
-tar jcf $DIRNAME.tar.bz2 $DIRNAME
-rm -rf $DIRNAME

sources

@@ -1 +0,0 @@
-SHA512 (libXres-1.2.0.tar.bz2) = 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172