rpms/lshw
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch to fix ext4 issue.

Browse Source
This commit is contained in:
Terje Rsten 2010-09-05 16:06:33 +02:00
parent 963165fbce
commit a550549894
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lshw-ext4.patch Normal file
View File

@ -0,0 +1,23 @@
Index: src/core/hw.cc
===================================================================
--- src/core/hw.cc (revision 2143)
+++ src/core/hw.cc (revision 2144)
@@ -47,13 +47,17 @@
string hw::strip(const string & s)
{
string result = s;
+ size_t i = result.find('\0');
+ if(i != string::npos)
+ result = result.substr(0, i);
+
while ((result.length() > 0) && ((uint8_t)result[0] <= ' '))
result.erase(0, 1);
while ((result.length() > 0) && ((uint8_t)result[result.length() - 1] <= ' '))
result.erase(result.length() - 1);
- for (unsigned int i = 0; i < result.length(); i++)
+ for (i = 0; i < result.length(); i++)
if ((uint8_t)result[i] < ' ')
{
result.erase(i, 1);

11
lshw.spec
View File

@ -1,7 +1,7 @@
Summary: Hardware lister Summary: Hardware lister
Name: lshw Name: lshw
Version: B.02.14 Version: B.02.14
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://ezix.org/project/wiki/HardwareLiSter URL: http://ezix.org/project/wiki/HardwareLiSter
@ -9,6 +9,7 @@ Source0: http://www.ezix.org/software/files/%{name}-%{version}.tar.gz
Source1: lshw.desktop Source1: lshw.desktop
Source2: lshw.consolehelper Source2: lshw.consolehelper
Source3: lshw.pam Source3: lshw.pam
Patch0: lshw-ext4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: hwdata Requires: hwdata
@ -38,6 +39,7 @@ plain, XML or HTML format.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p0
%{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile %{__sed} -i 's|-g -Wall -g|%{optflags}|' src/Makefile
%{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile %{__sed} -i 's|-g -Wall -Os|%{optflags}|' src/core/Makefile
@ -114,13 +116,16 @@ desktop-file-install --vendor fedora \
%{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/applications/fedora-%{name}.desktop
%changelog %changelog
* Sun Sep 05 2010 Terje Rosten <terje.rosten@ntnu.no> - B.02.14-4
- Add patch to fix ext4 issue.
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - B.02.14-3 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - B.02.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed May 06 2009 Adam Jackson <ajax@redhat.com> B.02.14-2 * Wed May 06 2009 Adam Jackson <ajax@redhat.com> - B.02.14-2
- Requires: hwdata - Requires: hwdata
- Drop redundant copies of pci.ids and friends, since we'll pick up the - Drop redundant copies of pci.ids and friends, since we'll pick up the
copies in hwdata at runtime. copies in hwdata at runtime
* Sun Mar 1 2009 Terje Rosten <terjeros@phys.ntnu.no> - B.02.14-1 * Sun Mar 1 2009 Terje Rosten <terjeros@phys.ntnu.no> - B.02.14-1
- B.02.14 - B.02.14