Hello community, here is the log from the commit of package hwinfo for openSUSE:Factory checked in at 2015-06-16 14:05:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hwinfo (Old) and /work/SRC/openSUSE:Factory/.hwinfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hwinfo" Changes: -------- --- /work/SRC/openSUSE:Factory/hwinfo/hwinfo.changes 2015-06-04 08:50:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hwinfo.new/hwinfo.changes 2015-06-16 14:05:03.000000000 +0200 @@ -1,0 +2,22 @@ +Mon Jun 15 13:46:21 CEST 2015 - [email protected] + +- another Makefile fix +- 21.16 + +------------------------------------------------------------------- +Mon Jun 15 12:22:50 CEST 2015 - [email protected] + +- fix Makefile typo +- 21.15 + +------------------------------------------------------------------- +Fri Jun 5 10:15:56 CEST 2015 - [email protected] + +- adjusting Makefile +- use pkg-config for dbus +- allow to build outside git repository +- update compiler flags +- fix spelling errors +- 21.14 + +------------------------------------------------------------------- Old: ---- hwinfo-21.13.tar.xz New: ---- hwinfo-21.16.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hwinfo.spec ++++++ --- /var/tmp/diff_new_pack.YJky3B/_old 2015-06-16 14:05:04.000000000 +0200 +++ /var/tmp/diff_new_pack.YJky3B/_new 2015-06-16 14:05:04.000000000 +0200 @@ -36,7 +36,7 @@ Group: Hardware/Other # Until migration to github this should be correct url Url: http://gitorious.org/opensuse/hwinfo -Version: 21.13 +Version: 21.16 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ hwinfo-21.13.tar.xz -> hwinfo-21.16.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/Makefile new/hwinfo-21.16/Makefile --- old/hwinfo-21.13/Makefile 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/Makefile 2015-06-15 13:44:34.000000000 +0200 @@ -12,16 +12,20 @@ GIT2LOG := $(shell if [ -x ./git2log ] ; then echo ./git2log --update ; else echo true ; fi) GITDEPS := $(shell [ -d .git ] && echo .git/HEAD .git/refs/heads .git/refs/tags) +BRANCH := $(shell [ -d .git ] && git branch | perl -ne 'print $$_ if s/^\*\s*//') +ifdef HWINFO_VERSION +VERSION := $(shell echo ${HWINFO_VERSION} > VERSION; cat VERSION) +else VERSION := $(shell $(GIT2LOG) --version VERSION ; cat VERSION) -BRANCH := $(shell git branch | perl -ne 'print $$_ if s/^\*\s*//') +endif PREFIX := hwinfo-$(VERSION) include Makefile.common ifeq "$(ARCH)" "x86_64" -LIBDIR = /usr/lib64 +LIBDIR ?= /usr/lib64 else -LIBDIR = /usr/lib +LIBDIR ?= /usr/lib endif ULIBDIR = $(LIBDIR) @@ -38,20 +42,25 @@ .PHONY: fullstatic static shared tiny doc diet tinydiet uc tinyuc +ifdef HWINFO_VERSION +changelog: + @true +else changelog: $(GITDEPS) $(GIT2LOG) --changelog changelog +endif hwscan: hwscan.o $(LIBHD) - $(CC) hwscan.o $(LDFLAGS) $(LIBS) -o $@ + $(CC) hwscan.o $(LDFLAGS) $(CFLAGS) $(LIBS) -o $@ hwinfo: hwinfo.o $(LIBHD) - $(CC) hwinfo.o $(LDFLAGS) $(LIBS) -o $@ + $(CC) hwinfo.o $(LDFLAGS) $(CFLAGS) $(LIBS) -o $@ hwscand: hwscand.o - $(CC) $< $(LDFLAGS) -o $@ + $(CC) $< $(LDFLAGS) $(CFLAGS) -o $@ hwscanqueue: hwscanqueue.o - $(CC) $< $(LDFLAGS) -o $@ + $(CC) $< $(LDFLAGS) $(CFLAGS) -o $@ hwinfo.pc: hwinfo.pc.in VERSION VERSION=`cat VERSION`; \ @@ -114,6 +123,7 @@ install -m 644 src/isdn/cdb/ISDN.CDB.hwdb $(DESTDIR)/usr/share/hwinfo archive: changelog + @if [ ! -d .git ] ; then echo no git repo ; false ; fi 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/Makefile.common new/hwinfo-21.16/Makefile.common --- old/hwinfo-21.13/Makefile.common 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/Makefile.common 2015-06-15 13:44:34.000000000 +0200 @@ -20,12 +20,12 @@ RPM_OPT_FLAGS ?= -O2 -CC = gcc +CC ?= gcc LD = ld -CFLAGS = $(RPM_OPT_FLAGS) -Wall -Wno-pointer-sign -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd +CFLAGS += $(RPM_OPT_FLAGS) -Wall -Wno-pointer-sign -pipe -g $(SHARED_FLAGS) $(EXTRA_FLAGS) -I$(TOPDIR)/src/hd SHARED_FLAGS = -fPIC -LDFLAGS = -Lsrc +LDFLAGS += -Lsrc CFILES = $(wildcard *.c) OBJS = $(CFILES:.c=.o) @@ -41,7 +41,7 @@ .PHONY: all distclean clean install subdirs %.o: %.c - $(CC) -c $(CFLAGS) $< + $(CC) -c $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< all: subdirs $(TARGETS) @@ -63,7 +63,7 @@ ifneq "$(CFILES)" "" ifeq ($(findstring $(MAKECMDGOALS), clean distclean),) .depend: $(CFILES) - @$(CC) -MG -MM $(CFLAGS) $(CFILES) >$@ + @$(CC) -MG -MM $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(CFILES) >$@ -include .depend endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/VERSION new/hwinfo-21.16/VERSION --- old/hwinfo-21.13/VERSION 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/VERSION 2015-06-15 13:44:34.000000000 +0200 @@ -1 +1 @@ -21.13 +21.16 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/changelog new/hwinfo-21.16/changelog --- old/hwinfo-21.13/changelog 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/changelog 2015-06-15 13:44:34.000000000 +0200 @@ -1,3 +1,16 @@ +2015-06-15: 21.16 + - another Makefile fix + +2015-06-15: 21.15 + - fix Makefile typo + +2015-06-05: 21.14 + - adjusting Makefile + - use pkg-config for dbus + - allow to build outside git repository + - update compiler flags + - fix spelling errors + 2015-06-03: 21.13 - do not print anything to the console - Collect and print "Week of Manufacture" EDID data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/src/Makefile new/hwinfo-21.16/src/Makefile --- old/hwinfo-21.13/src/Makefile 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/src/Makefile 2015-06-15 13:44:34.000000000 +0200 @@ -17,7 +17,7 @@ ifdef SHARED_FLAGS $(LIBHD_SO): $(LIBHD) - $(CC) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ + $(CC) -shared $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ -Wl,-soname=$(LIBHD_SONAME) \ -o $(LIBHD_SO) $(SO_LIBS) ln -snf $(LIBHD_NAME) $(LIBHD_SONAME) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/src/hd/Makefile new/hwinfo-21.16/src/hd/Makefile --- old/hwinfo-21.13/src/hd/Makefile 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/src/hd/Makefile 2015-06-15 13:44:34.000000000 +0200 @@ -4,8 +4,6 @@ include $(TOPDIR)/Makefile.common -CFLAGS += -I /usr/include/dbus-1.0 -I /usr/lib64/dbus-1.0/include -I /usr/lib/dbus-1.0/include - version.h: $(TOPDIR)/VERSION @echo "#define HD_VERSION_STRING \"`cat $(TOPDIR)/VERSION`\"" >$@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/src/hd/bios.c new/hwinfo-21.16/src/hd/bios.c --- old/hwinfo-21.13/src/hd/bios.c 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/src/hd/bios.c 2015-06-15 13:44:34.000000000 +0200 @@ -1044,7 +1044,7 @@ hd_log_hex(hd_data, 1, len, mem->data + cfg_len + u); ADD2LOG("\n"); if(len < 2) { - ADD2LOG(" oops: invalid record lenght\n"); + ADD2LOG(" oops: invalid record length\n"); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/src/ids/src/pci new/hwinfo-21.16/src/ids/src/pci --- old/hwinfo-21.13/src/ids/src/pci 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/src/ids/src/pci 2015-06-15 13:44:34.000000000 +0200 @@ -40633,7 +40633,7 @@ vendor.id pci 0x1139 &device.id pci 0x0001 -+device.name VGA Compatable 3D Graphics ++device.name VGA Compatible 3D Graphics vendor.id pci 0x113a +vendor.name FWB Inc @@ -83098,7 +83098,7 @@ vendor.id pci 0x8800 &device.id pci 0x2008 -+device.name Video assistent component ++device.name Video assistant component vendor.id pci 0x8866 +vendor.name T-Square Design Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hwinfo-21.13/src/ids/src/usb new/hwinfo-21.16/src/ids/src/usb --- old/hwinfo-21.13/src/ids/src/usb 2015-06-03 10:06:24.000000000 +0200 +++ new/hwinfo-21.16/src/ids/src/usb 2015-06-15 13:44:34.000000000 +0200 @@ -2389,7 +2389,7 @@ vendor.id usb 0x046d &device.id usb 0xc211 -+device.name iTouch Cordless Reciever ++device.name iTouch Cordless Receiver vendor.id usb 0x046d &device.id usb 0xc216 @@ -8067,7 +8067,7 @@ vendor.id usb 0x0714 &device.id usb 0x0003 -+device.name ADB to USB convertor ++device.name ADB to USB converter vendor.id usb 0x0717 +vendor.name ZNK Corp.
