Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pciutils for openSUSE:Factory checked in at 2021-06-18 10:13:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pciutils (Old) and /work/SRC/openSUSE:Factory/.pciutils.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pciutils" Fri Jun 18 10:13:16 2021 rev:66 rq:900056 version:3.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/pciutils/pciutils.changes 2020-11-05 21:54:48.752198665 +0100 +++ /work/SRC/openSUSE:Factory/.pciutils.new.2625/pciutils.changes 2021-06-18 10:13:23.341962739 +0200 @@ -1,0 +2,5 @@ +Tue May 11 14:19:35 UTC 2021 - Callum Farmer <[email protected]> + +- prepare usrmerge (boo#1029961) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils.spec ++++++ --- /var/tmp/diff_new_pack.xEX5m7/_old 2021-06-18 10:13:23.825963379 +0200 +++ /var/tmp/diff_new_pack.xEX5m7/_new 2021-06-18 10:13:23.829963384 +0200 @@ -70,17 +70,22 @@ %autosetup -p1 %build -%make_build OPT="%{optflags}" PREFIX=%{_prefix} LIBDIR=/%{_lib} SBINDIR=/sbin STRIP="" SHARED="yes" +%make_build OPT="%{optflags}" PREFIX=%{_prefix} LIBDIR=%{_libdir} SBINDIR=%{_sbindir} STRIP="" SHARED="yes" %install -make install PREFIX=%{buildroot}%{_prefix} SBINDIR=%{buildroot}/sbin \ - ROOT=%{buildroot}/ MANDIR=%{buildroot}/%{_mandir} STRIP="" \ - SHARED="yes" LIBDIR=%{buildroot}/%{_lib} +make install PREFIX=%{buildroot}%{_prefix} SBINDIR=%{buildroot}%{_sbindir} \ + ROOT=%{buildroot} MANDIR=%{buildroot}%{_mandir} STRIP="" \ + SHARED="yes" LIBDIR=%{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir}/pci -cp -p lib/{pci,header,config,types}.h %{buildroot}%{_includedir}/pci/ +cp -p lib/{pci,header,config,types}.h %{buildroot}%{_includedir}/pci rm -rf %{buildroot}%{_datadir}/pci.ids* install -D -m 0644 lib/libpci.pc %{buildroot}%{_libdir}/pkgconfig/libpci.pc -ln -sf /%{_lib}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so +ln -sf %{_libdir}/libpci.so.3 %{buildroot}%{_libdir}/libpci.so + +%if !0%{?usrmerged} +mkdir %{buildroot}/sbin +ln -s %{_sbindir}/{lspci,setpci} %{buildroot}/sbin +%endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig @@ -88,9 +93,13 @@ %files %license COPYING %doc README +%if !0%{?usrmerged} /sbin/lspci /sbin/setpci -%exclude /sbin/update-pciids +%endif +%{_sbindir}/lspci +%{_sbindir}/setpci +%exclude %{_sbindir}/update-pciids %{_mandir}/man7/pcilib.7%{?ext_man} %{_mandir}/man8/lspci.8%{?ext_man} %{_mandir}/man8/setpci.8%{?ext_man} @@ -99,11 +108,11 @@ %files -n %{lname} %license COPYING -/%{_lib}/libpci.so.* +%{_libdir}/libpci.so.* %files devel %license COPYING -%{_includedir}/pci/ +%{_includedir}/pci %{_libdir}/libpci.so %{_libdir}/pkgconfig/libpci.pc
