dist-git conversion

.gitignore

@@ -1 +1,2 @@
-/libXrandr-*.tar.xz
+libXrandr-1.2.99.4.tar.bz2
+libXrandr-1.3.0.tar.bz2

commitid

@@ -1 +0,0 @@
-c90f74497dbcb96854346435349c6e2207b530c5

libXrandr.spec

@@ -1,48 +1,36 @@
-%global tarball libXrandr
-#global gitdate 20130524
-%global gitversion c90f74497
-
 Summary: X.Org X11 libXrandr runtime library
 Name: libXrandr
-Version: 1.5.4
-Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
-License: HPND-sell-variant
+Version: 1.3.0
+Release: 5%{?dist}
+License: MIT
+Group: System Environment/Libraries
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?gitdate}
-Source0:    %{tarball}-%{gitdate}.tar.xz
-Source1:    make-git-snapshot.sh
-Source2:    commitid
-%else
-Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
-%endif
+Source0: http://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
+Patch0: randr-git.patch
 
-Requires: libX11 >= 1.6.0
-
-BuildRequires: make
-BuildRequires: xorg-x11-util-macros
-BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-proto-devel
-BuildRequires: pkgconfig(randrproto) >= 1.5.0
+BuildRequires: pkgconfig(randrproto) >= 1.3.0
 BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(xext)
-BuildRequires: pkgconfig(x11) >= 1.6.0
 
 %description
 X.Org X11 libXrandr runtime library
 
 %package devel
 Summary: X.Org X11 libXrandr development package
+Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description devel
 X.Org X11 libXrandr development package
 
 %prep
-%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%setup -q
+%patch0 -p1 -b .git
 
 %build
-autoreconf -v --install --force
 %configure  --disable-static
 make %{?_smp_mflags}
 
@@ -53,15 +41,20 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%ldconfig_post
-%ldconfig_postun
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog
 %{_libdir}/libXrandr.so.2
 %{_libdir}/libXrandr.so.2.2.0
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/X11/extensions/Xrandr.h
 %{_libdir}/libXrandr.so
 %{_libdir}/pkgconfig/xrandr.pc
@@ -69,140 +62,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_mandir}/man3/*.3*
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Oct 05 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.5.4-1
-- libXrandr 1.5.4
-
-* Wed Sep 06 2023 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 1.5.2-12
-- SPDX migration
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov  5 12:16:24 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 1.5.2-5
-- Add BuildRequires for make
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Mar 20 2019 Adam Jackson <ajax@redhat.com> - 1.5.2-1
-- libXrandr 1.5.2
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.5.1-7
-- Drop useless %%defattr
-
-* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 1.5.1-6
-- Use ldconfig scriptlet macros
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Oct 05 2016 Benjamin Tissoires <benjamin.tissoires@redhat.com> 1.5.1-1
-- libXrandr 1.5.1
-- fixes CVE-2016-7947, CVE-2016-7948
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun May 17 2015 Dave Airlie <airlied@redhat.com> 1.5.0-1
-- libXrandr 1.5.0 - fixup requires/br
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jul 24 2014 Benjamin Tissoires <benjamin.tissoires@redhat.com> 1.4.2-1%{?gitdate:.git}%{?dist}
-- libXrandr 1.4.2
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jun 03 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.4.1-1
-- libXrandr 1.4.1
-
-* Mon May 27 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.0-5.20130524gitc90f74497
-- Require libX11 1.6RC2 for _XEatDataWords
-
-* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.4.0-4.20130524gitc90f74497
-- Update to git snapshot to fix CVEs listed below:
-- CVE-2013-1986
-
-* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.0-3
-- autoreconf for aarch64
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 26 2012 Dave Airlie <airlied@redhat.com> 1.4.0-1
-- libXrandr 1.4.0 upstream release.
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Nov 08 2010 Adam Jackson <ajax@redhat.com> 1.3.1-1
-- libXrandr 1.3.1
-
 * Tue Nov 10 2009 Adam Jackson <ajax@redhat.com> 1.3.0-5
 - randr-git.patch: Update to git
 

make-git-snapshot.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=libXrandr-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/xorg/lib/libXrandr $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

randr-git.patch

@@ -0,0 +1,102 @@
+diff --git a/configure.ac b/configure.ac
+index a018667..09c5d8d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -32,7 +32,7 @@ dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
+ dnl
+ AC_INIT(libXrandr, 1.3.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+ AC_CONFIG_AUX_DIR(.)
+-AM_INIT_AUTOMAKE([dist-bzip2])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+ 
+ # Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
+index a411321..6b756a7 100644
+--- a/include/X11/extensions/Xrandr.h
++++ b/include/X11/extensions/Xrandr.h
+@@ -197,6 +197,7 @@ Time XRRTimes (Display *dpy, int screen, Time *config_timestamp);
+ 
+ /* Version 1.2 additions */
+ 
++/* despite returning a Status, this returns 1 for success */
+ Status
+ XRRGetScreenSizeRange (Display *dpy, Window window,
+ 		       int *minWidth, int *minHeight,
+diff --git a/src/XrrConfig.c b/src/XrrConfig.c
+index db7a1ae..34ff3ef 100644
+--- a/src/XrrConfig.c
++++ b/src/XrrConfig.c
+@@ -409,6 +409,7 @@ Status XRRSetScreenConfigAndRate (Display *dpy,
+     
+     (void) _XReply (dpy, (xReply *) &rep, 0, xTrue);
+ 
++    /* actually .errorCode in struct xError */
+     if (rep.status == RRSetConfigSuccess) {
+       /* if we succeed, set our view of reality to what we set it to */
+       config->config_timestamp = rep.newConfigTimestamp;
+diff --git a/src/XrrCrtc.c b/src/XrrCrtc.c
+index db9d0b4..697987a 100644
+--- a/src/XrrCrtc.c
++++ b/src/XrrCrtc.c
+@@ -167,7 +167,7 @@ XRRGetCrtcGammaSize (Display *dpy, RRCrtc crtc)
+     req->crtc = crtc;
+ 
+     if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
+-	rep.status = RRSetConfigFailed;
++	rep.size = 0;
+     UnlockDisplay (dpy);
+     SyncHandle ();
+     return rep.size;
+@@ -179,7 +179,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
+     XExtDisplayInfo	    *info = XRRFindDisplay(dpy);
+     xRRGetCrtcGammaReply    rep;
+     xRRGetCrtcGammaReq	    *req;
+-    XRRCrtcGamma	    *crtc_gamma;
++    XRRCrtcGamma	    *crtc_gamma = NULL;
+     long    		    nbytes;
+     long    		    nbytesRead;
+ 
+@@ -192,7 +192,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
+     req->crtc = crtc;
+ 
+     if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
+-	rep.status = RRSetConfigFailed;
++	goto out;
+ 
+     nbytes = (long) rep.length << 2;
+     
+@@ -204,9 +204,7 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
+     if (!crtc_gamma)
+     {
+ 	_XEatData (dpy, (unsigned long) nbytes);
+-	UnlockDisplay (dpy);
+-	SyncHandle ();
+-	return NULL;
++	goto out;
+     }
+     _XRead16 (dpy, crtc_gamma->red, rep.size * 2);
+     _XRead16 (dpy, crtc_gamma->green, rep.size * 2);
+@@ -214,7 +212,8 @@ XRRGetCrtcGamma (Display *dpy, RRCrtc crtc)
+     
+     if (nbytes > nbytesRead)
+ 	_XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
+-    
++
++out:
+     UnlockDisplay (dpy);
+     SyncHandle ();
+     return crtc_gamma;
+diff --git a/src/XrrProperty.c b/src/XrrProperty.c
+index 9554f9a..1a125b2 100644
+--- a/src/XrrProperty.c
++++ b/src/XrrProperty.c
+@@ -272,7 +272,7 @@ XRRGetOutputProperty (Display *dpy, RROutput output,
+     {
+ 	UnlockDisplay (dpy);
+ 	SyncHandle ();
+-	return 1;
++	return ((xError *)&rep)->errorCode;
+     }
+ 
+     *prop = (unsigned char *) NULL;

sources

@@ -1 +1 @@
-SHA512 (libXrandr-1.5.4.tar.xz) = f7c0b083943e11b4cc3c97e10e2cbbc3920fe0c9c5031ef86fca2eb5df413d767caf53dca266abf65395eb10e55354c8fe59ed6b3265402ffccb919a813bc781
+68eb59c3b7524db6ffd78746ee893d1d  libXrandr-1.3.0.tar.bz2