Hello community,
here is the log from the commit of package hwinfo for openSUSE:Factory
checked in at Mon Jun 15 16:35:30 CEST 2009.
--------
--- hwinfo/hwinfo.changes 2009-06-09 12:33:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/hwinfo/hwinfo.changes 2009-06-15 12:50:08.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jun 15 12:49:55 CEST 2009 - snwint@suse.de
+
+- fix build on non-x86 archs
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
hwinfo-16.1.tar.bz2
New:
----
hwinfo-16.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hwinfo.spec ++++++
--- /var/tmp/diff_new_pack.O29666/_old 2009-06-15 16:35:11.000000000 +0200
+++ /var/tmp/diff_new_pack.O29666/_new 2009-06-15 16:35:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package hwinfo (Version 16.1)
+# spec file for package hwinfo (Version 16.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,9 +31,9 @@
PreReq: /sbin/ldconfig %insserv_prereq %fillup_prereq
AutoReqProv: on
Summary: Hardware Library
-Version: 16.1
+Version: 16.2
Release: 1
-Source: hwinfo-16.1.tar.bz2
+Source: hwinfo-16.2.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -105,6 +105,8 @@
%doc doc/libhd/html
%changelog
+* Mon Jun 15 2009 snwint@suse.de
+- fix build on non-x86 archs
* Tue Jun 09 2009 snwint@suse.de
- rewrite monitor detection to use libx86emu
* Thu May 14 2009 snwint@suse.de
++++++ hwinfo-16.1.tar.bz2 -> hwinfo-16.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.1/Changelog new/hwinfo-16.2/Changelog
--- old/hwinfo-16.1/Changelog 2009-06-09 12:30:36.000000000 +0200
+++ new/hwinfo-16.2/Changelog 2009-06-15 11:32:08.000000000 +0200
@@ -1,3 +1,6 @@
+15/6/2009: v16.2
+ - fix build on non-x86 archs
+
9/6/2009: v16.1
- rewrite monitor detection to use libx86emu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.1/Makefile new/hwinfo-16.2/Makefile
--- old/hwinfo-16.1/Makefile 2009-06-08 17:22:49.000000000 +0200
+++ new/hwinfo-16.2/Makefile 2009-06-15 12:29:27.000000000 +0200
@@ -5,23 +5,23 @@
LIBDIR = /usr/lib
ULIBDIR = $(LIBDIR)
LIBS = -lhd
-SLIBS = -lhd -ldbus-1 -lhal -lx86emu
-TLIBS = -lhd_tiny -ldbus-1 -lhal -lx86emu
-SO_LIBS = -ldbus-1 -lhal -lx86emu
-TSO_LIBS = -ldbus-1 -lhal -lx86emu
+SLIBS = -lhd -ldbus-1 -lhal
+TLIBS = -lhd_tiny -ldbus-1 -lhal
+SO_LIBS = -ldbus-1 -lhal
+TSO_LIBS = -ldbus-1 -lhal
+
+export SO_LIBS
+
+include Makefile.common
# ia64
-ifneq "$(findstring $(ARCH), i386 x86_64)" ""
+ifneq ($(filter i386 x86_64, $(ARCH)),)
SLIBS += -lx86emu
TLIBS += -lx86emu
SO_LIBS += -lx86emu
TSO_LIBS += -lx86emu
endif
-export SO_LIBS
-
-include Makefile.common
-
SHARED_FLAGS =
OBJS_NO_TINY = names.o parallel.o modem.o
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.1/src/hd/bios.c new/hwinfo-16.2/src/hd/bios.c
--- old/hwinfo-16.1/src/hd/bios.c 2009-06-09 11:37:50.000000000 +0200
+++ new/hwinfo-16.2/src/hd/bios.c 2009-06-15 11:30:28.000000000 +0200
@@ -447,7 +447,9 @@
}
}
+#if defined(__i386__) || defined (__x86_64__)
get_vbe_info(hd_data, vbe);
+#endif
if(vbe->ok) {
bt->vbe_ver = vbe->version;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hwinfo-16.1/src/hd/mdt.c new/hwinfo-16.2/src/hd/mdt.c
--- old/hwinfo-16.1/src/hd/mdt.c 2009-06-09 12:27:10.000000000 +0200
+++ new/hwinfo-16.2/src/hd/mdt.c 2009-06-15 11:47:43.000000000 +0200
@@ -1,3 +1,5 @@
+#if defined(__i386__) || defined (__x86_64__)
+
#define _GNU_SOURCE
#include