Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2018-12-11 15:44:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Tue Dec 11 15:44:04 2018 rev:166 rq:655627 version:21.63 Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2018-11-12 09:36:13.593637379 +0100 +++ /work/SRC/openSUSE:Factory/.hwinfo.new.19453/hwinfo.changes 2018-12-11 15:44:08.450450021 +0100 @@ -1,0 +2,9 @@ +Thu Dec 6 12:16:33 UTC 2018 - snw...@suse.de + +- merge gh#openSUSE/hwinfo#75 +- adjust system type detection (bsc#1117982) +- rework version number generation in header file +- small correction +- 21.63 + +-------------------------------------------------------------------- Old: ---- hwinfo-21.62.tar.xz New: ---- hwinfo-21.63.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.F2w5f4/_old 2018-12-11 15:44:09.310449077 +0100 +++ /var/tmp/diff_new_pack.F2w5f4/_new 2018-12-11 15:44:09.314449073 +0100 @@ -36,7 +36,7 @@ License: GPL-2.0+ Group: Hardware/Other Url: http://gitorious.org/opensuse/hwinfo -Version: 21.62 +Version: 21.63 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.62.tar.xz -> hwinfo-21.63.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.62/Makefile new/hwinfo-21.63/Makefile --- old/hwinfo-21.62/Makefile 2018-11-09 11:21:48.000000000 +0100 +++ new/hwinfo-21.63/Makefile 2018-12-06 13:16:33.000000000 +0100 @@ -116,6 +116,8 @@ fi install -m 644 hwinfo.pc $(DESTDIR)$(ULIBDIR)/pkgconfig install -m 644 src/hd/hd.h $(DESTDIR)/usr/include + perl -pi -e "s/define\s+HD_VERSION\b.*/define HD_VERSION\t\t$(LIBHD_MAJOR_VERSION)/" $(DESTDIR)/usr/include/hd.h + perl -pi -e "s/define\s+HD_MINOR_VERSION\b.*/define HD_MINOR_VERSION\t$(LIBHD_MINOR_VERSION)/" $(DESTDIR)/usr/include/hd.h install -m 755 getsysinfo $(DESTDIR)/usr/sbin install -m 755 src/isdn/cdb/mk_isdnhwdb $(DESTDIR)/usr/sbin install -d -m 755 $(DESTDIR)/usr/share/hwinfo @@ -125,7 +127,6 @@ archive: changelog @if [ ! -d .git ] ; then echo no git repo ; false ; fi - make -C src/hd hd.h mkdir -p package git archive --prefix=$(PREFIX)/ $(BRANCH) > package/$(PREFIX).tar tar -r -f package/$(PREFIX).tar --mode=0664 --owner=root --group=root --mtime="`git show -s --format=%ci`" --transform='s:^:$(PREFIX)/:' VERSION changelog src/hd/hd.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.62/VERSION new/hwinfo-21.63/VERSION --- old/hwinfo-21.62/VERSION 2018-11-09 11:21:48.000000000 +0100 +++ new/hwinfo-21.63/VERSION 2018-12-06 13:16:33.000000000 +0100 @@ -1 +1 @@ -21.62 +21.63 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.62/changelog new/hwinfo-21.63/changelog --- old/hwinfo-21.62/changelog 2018-11-09 11:21:48.000000000 +0100 +++ new/hwinfo-21.63/changelog 2018-12-06 13:16:33.000000000 +0100 @@ -1,3 +1,9 @@ +2018-12-06: 21.63 + - merge gh#openSUSE/hwinfo#75 + - adjust system type detection (bsc#1117982) + - rework version number generation in header file + - small correction + 2018-11-09: 21.62 - merge gh#openSUSE/hwinfo#73 - update pci and usb ids (fate#326431) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.62/src/hd/Makefile new/hwinfo-21.63/src/hd/Makefile --- old/hwinfo-21.62/src/hd/Makefile 2018-11-09 11:21:48.000000000 +0100 +++ new/hwinfo-21.63/src/hd/Makefile 2018-12-06 13:16:33.000000000 +0100 @@ -7,9 +7,5 @@ version.h: $(TOPDIR)/VERSION @echo "#define HD_VERSION_STRING \"`cat $(TOPDIR)/VERSION`\"" >$@ -hd.h: $(TOPDIR)/VERSION - @perl -pi -e "s/define\s+HD_VERSION\s+\d+/define HD_VERSION\t$(LIBHD_MAJOR_VERSION)/" $@ - @perl -pi -e "s/define\s+HD_MINOR_VERSION\s+\d+/define HD_MINOR_VERSION\t$(LIBHD_MINOR_VERSION)/" $@ - $(LIBHD_D): $(OBJS) ar r $(LIBHD) $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.62/src/hd/hd.h new/hwinfo-21.63/src/hd/hd.h --- old/hwinfo-21.62/src/hd/hd.h 2018-11-09 11:21:48.000000000 +0100 +++ new/hwinfo-21.63/src/hd/hd.h 2018-12-06 13:16:33.000000000 +0100 @@ -19,8 +19,8 @@ */ /** Interface version */ -#define HD_VERSION 21 -#define HD_MINOR_VERSION 38 +#define HD_VERSION 0 /* will be set during install */ +#define HD_MINOR_VERSION 0 /* will be set during install */ #define HD_FULL_VERSION (HD_VERSION * 1000 + HD_MINOR_VERSION) /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.62/src/hd/int.c new/hwinfo-21.63/src/hd/int.c --- old/hwinfo-21.62/src/hd/int.c 2018-11-09 11:21:48.000000000 +0100 +++ new/hwinfo-21.63/src/hd/int.c 2018-12-06 13:16:33.000000000 +0100 @@ -1081,6 +1081,8 @@ hd_smbios_t *sm; struct { unsigned notebook:1; + unsigned notebook_by_mouse:1; + unsigned chassis_info:1; enum { v_none = 0, v_ibm = 1, v_toshiba, v_sony } vendor; } is = { }; char *s; @@ -1158,14 +1160,15 @@ } } - if( - sm->any.type == sm_chassis && - ( + if(sm->any.type == sm_chassis) { + is.chassis_info = 1; + + if( (sm->chassis.ch_type.id >= 8 && sm->chassis.ch_type.id <= 11) || sm->chassis.ch_type.id == 14 - ) - ) { - is.notebook = 1; + ) { + is.notebook = 1; + } } /* @@ -1177,10 +1180,15 @@ sm->any.type == sm_mouse && (sm->mouse.mtype.id == 5 || sm->mouse.mtype.id == 7) ) { - is.notebook = 1; + is.notebook_by_mouse = 1; } } + /* use is.notebook_by_mouse only if there's no usable chassis info (bsc #1117982) */ + if(!is.notebook) { + if(is.notebook_by_mouse && !is.chassis_info) is.notebook = 1; + } + /* check for battery, too (bnc #678456) */ if(!is.notebook) { for(sf = hd_data->sysfsdrv; sf; sf = sf->next) {
