diff --git a/.gitignore b/.gitignore index 0ffb1e2..a4a2869 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ libpciaccess-0.12.0.tar.bz2 /libpciaccess-0.13.4.tar.bz2 /libpciaccess-0.14.tar.bz2 /libpciaccess-0.15.tar.bz2 -/libpciaccess-0.16.tar.bz2 diff --git a/0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch b/0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch new file mode 100644 index 0000000..44a0fa1 --- /dev/null +++ b/0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch @@ -0,0 +1,27 @@ +From 1d71669e577f5f2eb02542851696d3bcb722a80b Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 11 Jul 2019 12:56:40 -0400 +Subject: [PATCH libpciaccess] linux: Don't try to include on arm + +It no longer exists in newer glibc, and didn't work like you'd have +hoped on anything but strongarm anyway. +--- + src/linux_sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c +index e74ad72..d022644 100644 +--- a/src/linux_sysfs.c ++++ b/src/linux_sysfs.c +@@ -50,7 +50,7 @@ + #include + #include + +-#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) ++#if defined(__i386__) || defined(__x86_64__) + #include + #else + #define inb(x) -1 +-- +2.21.0 + diff --git a/libpciaccess.spec b/libpciaccess.spec index 6a7c721..912ab5f 100644 --- a/libpciaccess.spec +++ b/libpciaccess.spec @@ -1,9 +1,9 @@ Name: libpciaccess -Version: 0.16 -Release: 16%{?dist} +Version: 0.15 +Release: 2%{?dist} Summary: PCI access library -License: HPND AND MIT +License: MIT URL: https://www.x.org/ # git snapshot. To recreate, run @@ -12,10 +12,13 @@ URL: https://www.x.org/ Source0: https://www.x.org/archive/individual/lib/%{name}-%{version}.tar.bz2 Source1: make-libpciaccess-snapshot.sh +# https://gitlab.freedesktop.org/xorg/lib/libpciaccess/merge_requests/7 +# will be in 0.16 +Patch0: 0001-linux-Don-t-try-to-include-sys-io.h-on-arm.patch + Patch2: libpciaccess-rom-size.patch BuildRequires: autoconf automake libtool pkgconfig xorg-x11-util-macros -BuildRequires: make Requires: hwdata %description @@ -56,54 +59,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la %{_libdir}/pkgconfig/pciaccess.pc %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.16-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jan 20 2025 Fedora Release Engineering - 0.16-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.16-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 0.16-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.16-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.16-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 15 2023 Dave Airlie - 0.16-10 -- migrate to SPDX license - -* Thu Jul 20 2023 Fedora Release Engineering - 0.16-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.16-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.16-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.16-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.16-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.16-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.16-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Oct 30 2019 Adam Jackson - 0.16-1 -- libpciaccess 0.16 - * Thu Jul 25 2019 Fedora Release Engineering - 0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 74a50c6..7d92252 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpciaccess-0.16.tar.bz2) = 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1 +SHA512 (libpciaccess-0.15.tar.bz2) = c34abc438c549db22d27d71d63e13f93cb547eaea238ff2d193627b83a5877e2b34f6fcf4cdaf9b4f0c6b78206447fd9a578454783cfb4e9010e8de20de1364e