#6 Fix build when %_bindir==%_sbindir
Merged 3 months ago by mhlavink. Opened 3 months ago by zbyszek.
rpms/ zbyszek/pciutils bin-sbin-merge  into  rawhide

file modified
+4
@@ -63,7 +63,9 @@ 

  install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_mandir}/man{7,8},%{_libdir},%{_libdir}/pkgconfig,%{_includedir}/pci}

  

  install -p lspci setpci update-pciids $RPM_BUILD_ROOT%{_sbindir}

+ %if "%{_sbindir}" != "%{_bindir}"

  ln -sr $RPM_BUILD_ROOT%{_sbindir}/lspci $RPM_BUILD_ROOT%{_bindir}/lspci

+ %endif

  install -p -m 644 lspci.8 setpci.8 update-pciids.8 $RPM_BUILD_ROOT%{_mandir}/man8

  install -p -m 644 pcilib.7 $RPM_BUILD_ROOT%{_mandir}/man7

  install -p lib/libpci.so.* $RPM_BUILD_ROOT%{_libdir}/
@@ -87,7 +89,9 @@ 

  %files

  %doc README ChangeLog pciutils.lsm

  %{_bindir}/lspci

+ %if "%{_sbindir}" != "%{_bindir}"

  %{_sbindir}/lspci

+ %endif

  %{_sbindir}/setpci

  %{_sbindir}/update-pciids

  %{_mandir}/man8/*

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/45329aa8752248c18df08eba08ff0b52

Pull-Request has been merged by mhlavink

3 months ago
Metadata