From 06a81bbde1a7e23aae8564c18ca392b44e513e66 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 23 Sep 2022 16:17:00 +0000 Subject: [PATCH] Auto sync2gitlab import of pciutils-3.7.0-3.el8.src.rpm --- pciutils.spec | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pciutils.spec b/pciutils.spec index 53ebeb5..8d03338 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,6 +1,6 @@ Name: pciutils Version: 3.7.0 -Release: 1%{?dist} +Release: 3%{?dist} Source: https://mirrors.edge.kernel.org/pub/software/utils/pciutils/%{name}-%{version}.tar.xz Source1: multilibconfigh @@ -20,8 +20,9 @@ ExclusiveOS: Linux Requires: hwdata Requires: %{name}-libs = %{version}-%{release} BuildRequires: sed kmod-devel -Summary: PCI bus related utilities -Group: Applications/System +Summary: PCI bus related utilities +Group: Applications/System +Provides: /sbin/lspci /sbin/setpci %description The pciutils package contains various utilities for inspecting and @@ -30,7 +31,7 @@ setting devices connected to the PCI bus. %package devel Summary: Linux PCI development library Group: Development/Libraries -Requires: zlib-devel pkgconfig %{name} = %{version}-%{release} +Requires: zlib-devel pkgconfig %{name}-libs%{?_isa} = %{version}-%{release} %description devel This package contains a library for inspecting and setting @@ -47,7 +48,7 @@ devices connected to the PCI bus. %package devel-static Summary: Linux PCI static library Group: System Environment/Libraries -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description devel-static This package contains a static library for inspecting and setting @@ -61,31 +62,30 @@ devices connected to the PCI bus. %patch5 -p1 -b .decodercec %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} +make SHARED="no" ZLIB="no" LIBKMOD=yes STRIP="" OPT="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" PREFIX="/usr" LIBDIR="%{_libdir}" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags} mv lib/libpci.a lib/libpci.a.toinstall make clean -make SHARED="yes" ZLIB="no" LIBKMOD=yes STRIP="" OPT="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" PREFIX="/usr" LIBDIR="/%{_lib}" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags} +make SHARED="yes" ZLIB="no" LIBKMOD=yes STRIP="" OPT="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" PREFIX="/usr" LIBDIR="%{_libdir}" IDSDIR="/usr/share/hwdata" PCI_IDS="pci.ids" %{?_smp_mflags} #fix lib vs. lib64 in libpci.pc (static Makefile is used) -sed -i "s|^libdir=.*$|libdir=/%{_lib}|" lib/libpci.pc +sed -i "s|^libdir=.*$|libdir=/%{_libdir}|" 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 -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_libdir},%{_libdir}/pkgconfig,%{_includedir}/pci} -install -p lspci setpci $RPM_BUILD_ROOT/sbin -install -p update-pciids $RPM_BUILD_ROOT/%{_sbindir} +install -p lspci setpci update-pciids $RPM_BUILD_ROOT%{_sbindir} install -p -m 644 lspci.8 setpci.8 update-pciids.8 $RPM_BUILD_ROOT%{_mandir}/man8 -install -p lib/libpci.so.* $RPM_BUILD_ROOT/%{_lib}/ -ln -s ../../%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/*.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so +install -p lib/libpci.so.* $RPM_BUILD_ROOT%{_libdir}/ +ln -s $(basename $RPM_BUILD_ROOT%{_libdir}/*.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/libpci.so mv lib/libpci.a.toinstall lib/libpci.a install -p -m 644 lib/libpci.a $RPM_BUILD_ROOT%{_libdir} -/sbin/ldconfig -N $RPM_BUILD_ROOT/%{_lib} +/sbin/ldconfig -N $RPM_BUILD_ROOT/%{_libdir} install -p lib/pci.h $RPM_BUILD_ROOT%{_includedir}/pci install -p lib/header.h $RPM_BUILD_ROOT%{_includedir}/pci install -p %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/pci/config.h @@ -99,14 +99,14 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig %files %doc README ChangeLog pciutils.lsm -/sbin/lspci -/sbin/setpci +%{_sbindir}/lspci +%{_sbindir}/setpci %{_sbindir}/update-pciids %{_mandir}/man8/* %files libs %license COPYING -/%{_lib}/libpci.so.* +%{_libdir}/libpci.so.* %files devel-static %{_libdir}/libpci.a @@ -118,6 +118,12 @@ install -p lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig %{_includedir}/pci %changelog +* Tue Sep 06 2022 Michal Hlavinka - 3.7.0-3 +- fix dependency of devel subpkg on libs (#2111644) + +* Tue Sep 06 2022 Michal Hlavinka - 3.7.0-2 +- fix locations wrt UsrMove(#2111644) + * Fri Oct 30 2020 Michal Hlavinka - 3.7.0-1 - pciutils updated to 3.7.0, add support for basic DVSEC and CXL DVSEC (#1856436) - add support for RCEC Associated Endpoint (#1856440)