Hello community, here is the log from the commit of package lshw for openSUSE:Factory checked in at 2016-06-23 13:36:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lshw (Old) and /work/SRC/openSUSE:Factory/.lshw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lshw" Changes: -------- --- /work/SRC/openSUSE:Factory/lshw/lshw.changes 2016-04-30 23:31:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lshw.new/lshw.changes 2016-06-23 13:36:39.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jun 20 11:25:53 UTC 2016 - [email protected] + +- Small spec file cleanup +- Do not ship pci/usb/oter id's as they are provided by other + packages as well +- Disable parallel building as it seems to cause random linking + failures (boo#985111) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lshw.spec ++++++ --- /var/tmp/diff_new_pack.E8B0Fa/_old 2016-06-23 13:36:40.000000000 +0200 +++ /var/tmp/diff_new_pack.E8B0Fa/_new 2016-06-23 13:36:40.000000000 +0200 @@ -30,7 +30,7 @@ BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(gail) >= 2.4.0 BuildRequires: pkgconfig(gdk-2.0) >= 2.4.0 @@ -88,20 +88,20 @@ %setup -q %build -make %{?_smp_mflags} \ +make \ PREFIX="%{_prefix}" \ SBINDIR="%{_sbindir}" \ MANDIR="%{_mandir}" \ DATADIR="%{_datadir}" \ CXX="g++" \ CC="gcc" \ - RPM_OPT_FLAGS="%{optflags}" \ + RPM_OPT_FLAGS="%{optflags} -fno-strict-aliasing" \ STRIP=touch \ - all \ - gui + all gui %install -make %{?_smp_mflags} \ +make \ + %{?_smp_mflags} \ DESTDIR=%{buildroot} \ PREFIX="%{_prefix}" \ SBINDIR="%{_sbindir}" \ @@ -110,8 +110,7 @@ CXX="g++" \ CC="gcc" \ OPTFLAGS="%{optflags}" \ - install \ - install-gui + install install-gui install -d "%{buildroot}%{_datadir}/applications" sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \ @@ -120,6 +119,11 @@ install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" %suse_update_desktop_file -r "%{name}" System HardwareSettings +# All of following are shipped by other packages as well +rm -f %{buildroot}%{_datadir}/%{name}/pci.ids +rm -f %{buildroot}%{_datadir}/%{name}/usb.ids +rm -f %{buildroot}%{_datadir}/%{name}/oui.txt +rm -f %{buildroot}%{_datadir}/%{name}/manuf.txt %find_lang lshw @@ -136,8 +140,6 @@ %doc README.md COPYING docs/TODO docs/Changelog docs/lshw.xsd %attr(0755,root,root) %{_sbindir}/lshw %dir %{_datadir}/lshw -%{_datadir}/lshw/*.txt -%{_datadir}/lshw/*.ids %{_mandir}/man1/lshw.1%{ext_man} %files gui
