diff --git a/.gitignore b/.gitignore index e7c0983..c627faa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libXrandr-*.tar.xz +libXrandr-1.2.2.tar.bz2 diff --git a/commitid b/commitid deleted file mode 100644 index 6034a05..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -c90f74497dbcb96854346435349c6e2207b530c5 diff --git a/libXrandr.spec b/libXrandr.spec index 57638b4..ee003dd 100644 --- a/libXrandr.spec +++ b/libXrandr.spec @@ -1,67 +1,71 @@ -%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.2.2 +Release: 1%{?dist} +License: MIT/X11 +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: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Requires: libX11 >= 1.6.0 - -BuildRequires: make -BuildRequires: xorg-x11-util-macros -BuildRequires: autoconf automake libtool +BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(randrproto) >= 1.5.0 -BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(x11) >= 1.6.0 +BuildRequires: randrproto >= 1.2.1 +BuildRequires: libX11-devel +BuildRequires: libXext-devel +BuildRequires: libXrender-devel + +Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXrandr runtime library %package devel Summary: X.Org X11 libXrandr development package +Group: Development/Libraries +Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-proto-devel +Requires: randrproto >= 1.2.1 + +Obsoletes: XFree86-devel, xorg-x11-devel + %description devel X.Org X11 libXrandr development package %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q %build -autoreconf -v --install --force %configure --disable-static -make %{?_smp_mflags} +make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT +# We intentionally don't ship *.la files 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 README ChangeLog %{_libdir}/libXrandr.so.2 -%{_libdir}/libXrandr.so.2.2.0 +%{_libdir}/libXrandr.so.2.1.0 %files devel +%defattr(-,root,root,-) +%dir %{_includedir}/X11 +%dir %{_includedir}/X11/extensions %{_includedir}/X11/extensions/Xrandr.h %{_libdir}/libXrandr.so %{_libdir}/pkgconfig/xrandr.pc @@ -69,180 +73,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man3/*.3* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.5.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.5.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 1.5.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.5.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Oct 05 2023 Peter Hutterer - 1.5.4-1 -- libXrandr 1.5.4 - -* Wed Sep 06 2023 Benjamin Tissoires - 1.5.2-12 -- SPDX migration - -* Thu Jul 20 2023 Fedora Release Engineering - 1.5.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.5.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1.5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.5.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.5.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.5.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 12:16:24 AEST 2020 Peter Hutterer - 1.5.2-5 -- Add BuildRequires for make - -* Tue Jul 28 2020 Fedora Release Engineering - 1.5.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 20 2019 Adam Jackson - 1.5.2-1 -- libXrandr 1.5.2 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.5.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Adam Jackson - 1.5.1-7 -- Drop useless %%defattr - -* Fri Jun 29 2018 Adam Jackson - 1.5.1-6 -- Use ldconfig scriptlet macros - -* Wed Feb 07 2018 Fedora Release Engineering - 1.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Oct 05 2016 Benjamin Tissoires 1.5.1-1 -- libXrandr 1.5.1 -- fixes CVE-2016-7947, CVE-2016-7948 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun May 17 2015 Dave Airlie 1.5.0-1 -- libXrandr 1.5.0 - fixup requires/br - -* Sun Aug 17 2014 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 24 2014 Benjamin Tissoires 1.4.2-1%{?gitdate:.git}%{?dist} -- libXrandr 1.4.2 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jun 03 2013 Peter Hutterer 1.4.1-1 -- libXrandr 1.4.1 - -* Mon May 27 2013 Peter Hutterer - 1.4.0-5.20130524gitc90f74497 -- Require libX11 1.6RC2 for _XEatDataWords - -* Fri May 24 2013 Peter Hutterer 1.4.0-4.20130524gitc90f74497 -- Update to git snapshot to fix CVEs listed below: -- CVE-2013-1986 - -* Thu Mar 07 2013 Peter Hutterer - 1.4.0-3 -- autoreconf for aarch64 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 26 2012 Dave Airlie 1.4.0-1 -- libXrandr 1.4.0 upstream release. - -* Thu Jul 19 2012 Fedora Release Engineering - 1.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 08 2010 Adam Jackson 1.3.1-1 -- libXrandr 1.3.1 - -* Tue Nov 10 2009 Adam Jackson 1.3.0-5 -- randr-git.patch: Update to git - -* Fri Jul 24 2009 Fedora Release Engineering - 1.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 23 2009 Adam Jackson 1.3.0-2 -- Un-require xorg-x11-filesystem -- Remove useless %%dir - -* Thu Jul 16 2009 Adam Jackson 1.3.0-1 -- libXrandr 1.3.0 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.2.99.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Adam Jackson 1.2.99.4-2 -- libXrandr-1.2.99.4-gop.patch: Fix encoding of GetOutputPrimary. - -* Wed Dec 17 2008 Adam Jackson 1.2.99.4-1 -- libXrandr 1.2.99.4 - -* Tue Nov 11 2008 Adam Jackson 1.2.3-3 -- Fix Requires in -devel subpackage - -* Mon Nov 10 2008 Adam Jackson 1.2.3-2 -- Fix BuildRequires. - -* Thu Sep 04 2008 Adam Jackson 1.2.3-1 -- libXrandr 1.2.3 - -* Tue Feb 19 2008 Fedora Release Engineering - 1.2.2-3 -- Autorebuild for GCC 4.3 - -* Tue Jan 15 2008 parag 1.2.2-2 -- Merge-Review #226083 -- Removed BR:pkgconfig -- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes -- Removed zero-length README file - * Mon Sep 24 2007 Adam Jackson 1.2.2-1 - libXrandr 1.2.2 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 2c38e4a..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -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 diff --git a/sources b/sources index beb4341..8d7e7e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXrandr-1.5.4.tar.xz) = f7c0b083943e11b4cc3c97e10e2cbbc3920fe0c9c5031ef86fca2eb5df413d767caf53dca266abf65395eb10e55354c8fe59ed6b3265402ffccb919a813bc781 +1b244b5d19f0ccab01d7083436cd3558 libXrandr-1.2.2.tar.bz2