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

- Add patch to fix build with gcc-4.5

Browse Source
This commit is contained in:
Terje Rsten 2010-09-05 19:46:19 +02:00
parent a550549894
commit e6b36de4c1
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lshw-B.02.14-gcc45.patch Normal file
View File

@ -0,0 +1,11 @@
--- lshw-B.02.14/src/core/scsi.cc~ 2010-09-05 19:36:47.411010711 +0200
+++ lshw-B.02.14/src/core/scsi.cc 2010-09-05 19:02:19.148903622 +0200
@@ -842,7 +842,7 @@
if (!controller)
{
- controller = node.addChild(hwNode::hwNode("scsi", hw::storage));
+ controller = node.addChild(hwNode("scsi", hw::storage));
if (controller)
{
controller->setLogicalName(host_logicalname(number));

9
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: 4%{?dist} Release: 5%{?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
@ -10,6 +10,7 @@ Source1: lshw.desktop
Source2: lshw.consolehelper Source2: lshw.consolehelper
Source3: lshw.pam Source3: lshw.pam
Patch0: lshw-ext4.patch Patch0: lshw-ext4.patch
Patch1: lshw-B.02.14-gcc45.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: hwdata Requires: hwdata
@ -40,6 +41,7 @@ plain, XML or HTML format.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p0 %patch0 -p0
%patch1 -p1
%{__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
@ -116,8 +118,11 @@ 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-5
- Add patch to fix build with gcc-4.5
* Sun Sep 05 2010 Terje Rosten <terje.rosten@ntnu.no> - B.02.14-4 * Sun Sep 05 2010 Terje Rosten <terje.rosten@ntnu.no> - B.02.14-4
- Add patch to fix ext4 issue. - 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