From 5182ff356cd787fbb08f450017ad8137e47fe2f27273563513b7122593592113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sat, 30 Apr 2011 01:46:51 +0000 Subject: [PATCH] Accepting request 68882 from home:pbleser:Hardware new package for hardware: lshw OBS-URL: https://build.opensuse.org/request/show/68882 OBS-URL: https://build.opensuse.org/package/show/hardware/lshw?expand=0&rev=1 --- .gitattributes | 23 +++++++ .gitignore | 1 + lshw-B.02.15.tar.bz2 | 3 + lshw-gcc43.patch | 23 +++++++ lshw.changes | 65 +++++++++++++++++++ lshw.desktop.in | 12 ++++ lshw.png | 3 + lshw.spec | 151 +++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 281 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 lshw-B.02.15.tar.bz2 create mode 100644 lshw-gcc43.patch create mode 100644 lshw.changes create mode 100644 lshw.desktop.in create mode 100644 lshw.png create mode 100644 lshw.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/lshw-B.02.15.tar.bz2 b/lshw-B.02.15.tar.bz2 new file mode 100644 index 0000000..3b60646 --- /dev/null +++ b/lshw-B.02.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54b05f213fe633530f7259c29a086d4b0e4f2545e1334bb30db38c0326be4d0e +size 1132242 diff --git a/lshw-gcc43.patch b/lshw-gcc43.patch new file mode 100644 index 0000000..b1e54d9 --- /dev/null +++ b/lshw-gcc43.patch @@ -0,0 +1,23 @@ +--- src/core/abi.cc.orig 2009-02-12 23:53:09.000000000 +0100 ++++ src/core/abi.cc 2010-06-16 15:44:33.000000000 +0200 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); + +@@ -37,10 +38,10 @@ + for(i=0; id_name); +- free(namelist[i]); ++ std::free(namelist[i]); + } + if(namelist) +- free(namelist); ++ std::free(namelist); + } + + popd(); diff --git a/lshw.changes b/lshw.changes new file mode 100644 index 0000000..a6a8e25 --- /dev/null +++ b/lshw.changes @@ -0,0 +1,65 @@ +------------------------------------------------------------------- +Wed Oct 6 08:08:03 UTC 2010 - pascal.bleser@opensuse.org + +- update to B.02.15: + * adds experimental support for dumping information into an SQLite database + * a French localization was added + * a number of bugs were fixed + +------------------------------------------------------------------- +Wed Jun 16 13:44:55 UTC 2010 - pascal.bleser@opensuse.org + +- rework patch for Factory (with 0 fuzz) + +- repackage upstream tarball as .tar.bz2 + +------------------------------------------------------------------- +Sat Feb 14 00:00:00 UTC 2009 - guru@unixtech.be + +- update to B.02.14: + * fixes several bugs that caused lshw to hang while scanning the system + * improves portability + * adds support for detection of EXT4 volumes + + +------------------------------------------------------------------- +Sun May 11 00:00:00 UTC 2008 - guru@unixtech.be + +- moved to openSUSE Build Service +- new upstream version + + +------------------------------------------------------------------- +Sun Oct 14 00:00:00 UTC 2007 - guru@unixtech.be + +- new upstream version + + +------------------------------------------------------------------- +Wed Oct 10 00:00:00 UTC 2007 - guru@unixtech.be + +- moved to Packman +- new upstream version + + +------------------------------------------------------------------- +Wed Nov 8 00:00:00 UTC 2006 - guru@unixtech.be + +- new upstream version + + +------------------------------------------------------------------- +Wed May 10 00:00:00 UTC 2006 - guru@unixtech.be + +- added binary stripping on SUSE < 9.3 +- replaced /usr/share with _datadir +- removed Packager and Distribution, injected by rpmmacros +- new upstream version + + +------------------------------------------------------------------- +Sun Mar 5 00:00:00 UTC 2006 - guru@unixtech.be + +- new package + + diff --git a/lshw.desktop.in b/lshw.desktop.in new file mode 100644 index 0000000..ad75053 --- /dev/null +++ b/lshw.desktop.in @@ -0,0 +1,12 @@ +[Desktop Entry] +Categories= +Encoding=UTF-8 +Terminal=false +Icon=lshw +Exec=@@EXEC@@ +Type=Application +StartupNotify=false +Name=Hardware Lister +GenericName=Hardware Diagnostics +X-KDE-SubstituteUID=true +X-KDE-Username=root diff --git a/lshw.png b/lshw.png new file mode 100644 index 0000000..1e0921b --- /dev/null +++ b/lshw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95ad0484d89fac35c97ab632a72310729d40686306cdcd398809f3a75feaafb9 +size 3196 diff --git a/lshw.spec b/lshw.spec new file mode 100644 index 0000000..9e11de0 --- /dev/null +++ b/lshw.spec @@ -0,0 +1,151 @@ +# norootforbuild + +%if %{?!_without_gui:1}0 +%define with_gui 1 +%endif + +Name: lshw +Version: B.02.15 +Release: 0 +Summary: HardWare LiSter +# http://ezix.org/software/files/lshw-%{version}.tar.gz +Source: lshw-%{version}.tar.bz2 +Source1: %{name}.desktop.in +Source2: %{name}.png +Patch1: lshw-gcc43.patch +URL: http://ezix.org/project/wiki/HardwareLiSter +Group: Hardware/Other +License: GNU General Public License (GPL) +BuildRoot: %{_tmppath}/build-%{name}-%{version} +BuildRequires: make gcc gcc-c++ update-desktop-files +BuildRequires: sqlite3-devel +BuildRequires: libstdc++-devel +%if %{?with_gui:1}0 +BuildRequires: gtk2-devel >= 2.4.0 +BuildRequires: libglade2-devel +BuildRequires: libpng-devel pango-devel zlib-devel +%endif + +%description +lshw (Hardware Lister) is a small tool to provide detailed informaton on the +hardware configuration of the machine. It can report exact memory +configuration, firmware version, mainboard configuration, CPU version and +speed, cache config uration, bus speed, etc. on DMI-capable x86 systems and +on some PowerPC machines (PowerMac G4 is known to work). + +Information can be output in plain text, XML or HTML. + +For detailed information on lshw features and usage, please see the +included documentation or go to the lshw Web page, +http://www.ezix.org/software/lshw.html + +%if %{?with_gui:1}0 +%package gui +Summary: HardWare LiSter (GUI Frontend) +Group: Hardware/Other +Requires: %{name} = %{version}-%{release} + +%description gui +lshw (Hardware Lister) is a small tool to provide detailed informaton on the +hardware configuration of the machine. It can report exact memory +configuration, firmware version, mainboard configuration, CPU version and +speed, cache config uration, bus speed, etc. on DMI-capable x86 systems and +on some PowerPC machines (PowerMac G4 is known to work). + +This package provides a graphical user interface to display hardware +information. + +For detailed information on lshw features and usage, please see the +included documentation or go to the lshw Web page, +http://www.ezix.org/software/lshw.html +%endif + +%debug_package +%prep +%setup -q +%patch1 + +%build +%__make %{?jobs:-j%{jobs}} \ + PREFIX="%{_prefix}" \ + SBINDIR="%{_sbindir}" \ + MANDIR="%{_mandir}" \ + DATADIR="%{_datadir}" \ + CXX="%__cxx" \ + CC="%__cc" \ + RPM_OPT_FLAGS="%{optflags}" \ + STRIP=touch \ + all + +%if %{?with_gui:1}0 +%__make %{?jobs:-j%{jobs}} \ + PREFIX="%{_prefix}" \ + SBINDIR="%{_sbindir}" \ + MANDIR="%{_mandir}" \ + DATADIR="%{_datadir}" \ + CXX="%__cxx" \ + CC="%__cc" \ + RPM_OPT_FLAGS="%{optflags}" \ + STRIP=touch \ + gui +%endif + +%install +%__make %{?jobs:-j%{jobs}} \ + DESTDIR="%{buildroot}" \ + PREFIX="%{_prefix}" \ + SBINDIR="%{_sbindir}" \ + MANDIR="%{_mandir}" \ + DATADIR="%{_datadir}" \ + CXX="%__cxx" \ + CC="%__cc" \ + OPTFLAGS="%{optflags}" \ + install + +%if %{?with_gui:1}0 +%__make %{?jobs:-j%{jobs}} \ + DESTDIR="%{buildroot}" \ + PREFIX="%{_prefix}" \ + SBINDIR="%{_sbindir}" \ + MANDIR="%{_mandir}" \ + DATADIR="%{_datadir}" \ + CXX="%__cxx" \ + CC="%__cc" \ + OPTFLAGS="%{optflags}" \ + install-gui +%endif + +%__install -d "%{buildroot}%{_datadir}/applications" +%__sed 's,@@EXEC@@,%{_sbindir}/gtk-lshw,g' < "%{SOURCE1}" \ + > "%{buildroot}%{_datadir}/applications/%{name}.desktop" +%__chmod 0644 "%{buildroot}%{_datadir}/applications/%{name}.desktop" +%__install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/%{name}.png" + +%suse_update_desktop_file -r "%{name}" System HardwareSettings + +%find_lang lshw + +%clean +%__rm -rf "%{buildroot}" + +%files -f lshw.lang +%defattr(-,root,root,0755) +%doc README COPYING docs/TODO docs/Changelog docs/lshw.xsd +%attr(0755,root,root) %{_sbindir}/lshw +%dir %{_datadir}/lshw +%{_datadir}/lshw/*.txt +%{_datadir}/lshw/*.ids +%doc %{_mandir}/man1/lshw.1%{ext_man} + +%if %{?with_gui:1}0 +%files gui +%defattr(-,root,root,0755) +%doc COPYING +%attr(0755,root,root) %{_sbindir}/gtk-lshw +%{_datadir}/lshw/artwork +%{_datadir}/applications/%{name}.desktop +%{_datadir}/pixmaps/%{name}.png +%endif + +%changelog +# vim: set sw=4 ts=4 et: