From 01db5e449150893f20a626016e1c29b681763746 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Thu, 23 Jan 2020 00:35:16 +0000
Subject: [PATCH] 3.6.3, spec cleanups, use %%license, use kernel.org download

---
 .gitignore    |  1 +
 pciutils.spec | 30 +++++++++++++++---------------
 sources       |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index f651562..c4d7868 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ pciutils-3.1.6.tar.gz
 /pciutils-3.6.0.tar.gz
 /pciutils-3.6.1.tar.gz
 /pciutils-3.6.2.tar.gz
+/pciutils-3.6.3.tar.xz
diff --git a/pciutils.spec b/pciutils.spec
index 17506cf..b68cd07 100644
--- a/pciutils.spec
+++ b/pciutils.spec
@@ -1,8 +1,12 @@
 Name:		pciutils
-Version:	3.6.2
-Release:	3%{?dist}
-Source:		ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/%{name}-%{version}.tar.gz
-Source1:        multilibconfigh
+Version:	3.6.3
+Release:	1%{?dist}
+Summary:	PCI bus related utilities
+License:	GPLv2+
+URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
+
+Source:		https://mirrors.edge.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.xz
+Source1:	multilibconfigh
 
 #change pci.ids directory to hwdata, fedora/rhel specific
 Patch1:		pciutils-2.2.1-idpath.patch
@@ -10,13 +14,9 @@ Patch1:		pciutils-2.2.1-idpath.patch
 #add support for directory with another pci.ids, rejected by upstream, rhbz#195327
 Patch2:		pciutils-dir-d.patch
 
-License:	GPLv2+
-URL:		http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
-ExclusiveOS:	Linux
 Requires:	hwdata
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRequires:	gcc sed kmod-devel
-Summary: PCI bus related utilities
 
 %description
 The pciutils package contains various utilities for inspecting and
@@ -46,9 +46,7 @@ This package contains a static library for inspecting and setting
 devices connected to the PCI bus.
 
 %prep
-%setup -q -n pciutils-%{version}
-%patch1 -p1 -b .idpath
-%patch2 -p1 -b .dird
+%autosetup -p1
 
 %build
 make SHARED="no" ZLIB="no" LIBKMOD=yes STRIP="" OPT="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" PREFIX="/usr" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags}
@@ -63,8 +61,6 @@ sed -i "s|^libdir=.*$|libdir=/%{_lib}|" lib/libpci.pc
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT/{sbin,%{_sbindir},%{_lib},%{_mandir}/man8,%{_libdir},%{_libdir}/pkgconfig,%{_includedir}/pci}
 
 install -p lspci setpci $RPM_BUILD_ROOT/sbin
@@ -86,14 +82,14 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 %ldconfig_scriptlets libs
 
 %files
-%doc README ChangeLog pciutils.lsm COPYING
+%doc README ChangeLog pciutils.lsm
 /sbin/lspci
 /sbin/setpci
 %{_sbindir}/update-pciids
 %{_mandir}/man8/*
 
 %files libs
-%doc COPYING
+%license COPYING
 %defattr(-,root,root,-)
 /%{_lib}/libpci.so.*
 
@@ -106,6 +102,10 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 %{_includedir}/pci
 
 %changelog
+* Wed Jan 22 2020 Peter Robinson <pbrobinson@fedoraproject.org> 3.6.3-1
+- pciutils updated to 3.6.3
+- spec cleanups, use %%license, use kernel.org download
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index a9ddc24..496f421 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pciutils-3.6.2.tar.gz) = ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
+SHA512 (pciutils-3.6.3.tar.xz) = c6910955053142db426093451880a19abb1ef04e259b848d978b3825999afad7dbae2a5ac0f7dd386496e7b995b671e945bc8dc11625e7985f0a7219a6e1a649