- version 21.1

OBS-URL: https://build.opensuse.org/package/show/system:install:head/hwinfo?expand=0&rev=58

hwinfo-21.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:291a524d645a6310903b9d6292be1c76ab1c3bf957ee1c61aa0fddae7693fb09
-size 670144

hwinfo-21.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02f9f361cc6fdd283c339674410d93ac1ea4051b266829b0d2c47eeed45e9cf7
+size 684754

hwinfo.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Mar 24 13:46:26 CET 2014 - snwint@suse.de
+
+- s390: add some virtio device IDs (bnc #807532)
+- adding fingerprint reader (bnc #793928)
+- use 'cp -x' in getsysinfo (bnc #760240)
+- s390: recognize model 2 OSA Express interfaces (bnc #720082)
+- add id to Validity fingerprint sensor (bnc #719202)
+- add unisys hypervisor bus info (bnc #678966)
+- report InfiniBand controller as network controller (bnc #645877, bnc #644299)
+- recognize InfiniBand controller (bnc #645877, bnc #644299, bnc #639807)
+- fix type to avoid compiler warning
+- VMWare -> VMware (bnc #536888)
+- integrated & removed hwinfo_pci_scan_label.patch
+
 -------------------------------------------------------------------
 Mon Jan 27 19:32:58 UTC 2014 - trenn@suse.de
 

hwinfo.spec

@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           hwinfo
 BuildRequires:  doxygen
 BuildRequires:  flex
@@ -37,10 +36,9 @@ License:        GPL-2.0+
 Group:          Hardware/Other
 # Until migration to github this should be correct url
 Url:            http://gitorious.org/opensuse/hwinfo
-Version:        21.0
+Version:        21.1
 Release:        0
-Source:         hwinfo-21.0.tar.bz2
+Source:         hwinfo-21.1.tar.bz2
-Patch0:         hwinfo_pci_scan_label.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -75,7 +73,6 @@ system.
 
 %prep
 %setup
-%patch0 -p1
 
 %build
   make static

hwinfo_pci_scan_label.patch

@@ -1,61 +0,0 @@
-Index: hwinfo-21.0/src/hd/hd.h
-===================================================================
---- hwinfo-21.0.orig/src/hd/hd.h
-+++ hwinfo-21.0/src/hd/hd.h
-@@ -1047,6 +1047,7 @@ typedef struct s_pci_t {
-   char *sysfs_id;				/**< sysfs path */
-   char *sysfs_bus_id;				/**< sysfs bus id */
-   char *modalias;				/**< module alias */
-+  char *label;					/**< Consistant Device Name (CDN), pci firmware spec 3.1, chapter 4.6.7 */
-   unsigned edid_len[4];				/**< edid record length */
-   unsigned char edid_data[4][0x80];		/**< edid record */
- } pci_t;
-@@ -2583,6 +2584,7 @@ typedef struct s_hd_t {
-   hal_prop_t *persistent_prop;	/**< persistent property list */
- 
-   char *modalias;		/**< module alias */
-+  char *label;			/**< Consistent Device Name (CDN), pci firmware spec 3.1, chapter 4.6.7 */
- 
-   /*
-    * These are used internally for memory management.
-Index: hwinfo-21.0/src/hd/pci.c
-===================================================================
---- hwinfo-21.0.orig/src/hd/pci.c
-+++ hwinfo-21.0/src/hd/pci.c
-@@ -192,6 +192,11 @@ void hd_pci_read_data(hd_data_t *hd_data
-       pci->irq = ul0;
-     }
- 
-+    if((s = get_sysfs_attr_by_path(sf_dev, "label"))) {
-+      pci->label = canon_str(s, strlen(s));
-+      ADD2LOG("    label = \"%s\"\n", pci->label);
-+    }
-+
-     sl = hd_attr_list(get_sysfs_attr_by_path(sf_dev, "resource"));
-     for(u = 0; sl; sl = sl->next, u++) {
-       if(
-@@ -432,6 +437,11 @@ void hd_pci_complete_data(hd_t *hd)
-     pci->modalias = NULL;
-   }
- 
-+  if(pci->label && *pci->label) {
-+    hd->label = pci->label;
-+    pci->label = NULL;
-+  }
-+
-   hd->slot = pci->slot + (pci->bus << 8);
-   hd->func = pci->func;
-   hd->base_class.id = pci->base_class;
-Index: hwinfo-21.0/src/hd/hdp.c
-===================================================================
---- hwinfo-21.0.orig/src/hd/hdp.c
-+++ hwinfo-21.0/src/hd/hdp.c
-@@ -357,6 +357,8 @@ void dump_normal(hd_data_t *hd_data, hd_
-   hd_detail_monitor_t *mdetail;
-   static char *geo_type_str[] = { "Physical", "Logical", "BIOS EDD", "BIOS Legacy" };
- 
-+  if(h->label) dump_line("Device Name: \"%s\"\n", h->label);
-+
-   if(h->model) dump_line("Model: \"%s\"\n", h->model);
- 
-   s = NULL;