[lshw] - Add patch to fix build with gcc-4.5
terjeros
terjeros at fedoraproject.org
Sun Sep 5 17:46:17 UTC 2010
commit e6b36de4c1c4c9f0bed5fbc4ed5e3f0657448a86
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Sun Sep 5 19:46:19 2010 +0200
- Add patch to fix build with gcc-4.5
lshw-B.02.14-gcc45.patch | 11 +++++++++++
lshw.spec | 9 +++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/lshw-B.02.14-gcc45.patch b/lshw-B.02.14-gcc45.patch
new file mode 100644
index 0000000..b259884
--- /dev/null
+++ b/lshw-B.02.14-gcc45.patch
@@ -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));
diff --git a/lshw.spec b/lshw.spec
index 6f1ea0b..de6ad4e 100644
--- a/lshw.spec
+++ b/lshw.spec
@@ -1,7 +1,7 @@
Summary: Hardware lister
Name: lshw
Version: B.02.14
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/System
URL: http://ezix.org/project/wiki/HardwareLiSter
@@ -10,6 +10,7 @@ Source1: lshw.desktop
Source2: lshw.consolehelper
Source3: lshw.pam
Patch0: lshw-ext4.patch
+Patch1: lshw-B.02.14-gcc45.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: hwdata
@@ -40,6 +41,7 @@ plain, XML or HTML format.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p0
+%patch1 -p1
%{__sed} -i 's|-g -Wall -g|%{optflags}|' src/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
%changelog
+* Sun Sep 05 2010 Terje Rosten <terje.rosten at ntnu.no> - B.02.14-5
+- Add patch to fix build with gcc-4.5
+
* Sun Sep 05 2010 Terje Rosten <terje.rosten at 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 at lists.fedoraproject.org> - B.02.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list