- updated to 1.6.11

- updated make patch
- added nortas patch to allow archs other than ppc

Changed files:
    lsvpd-make.patch -> 1.4
    lsvpd-nortas.patch -> 1.1
    lsvpd.spec -> 1.31

diff --git a/lsvpd-make.patch b/lsvpd-make.patch
index b654e0cde45d293b863a56fda24ecb754e8689d2..583d19d5ab2c15a8db556118469434ffcdb593ef 100644 (file)
--- a/lsvpd-make.patch
+++ b/lsvpd-make.patch
@@ -1,13 +1,13 @@
---- lsvpd-1.6.10/Makefile.am.orig      2010-10-16 01:18:16.000000000 +0200
-+++ lsvpd-1.6.10/Makefile.am   2011-05-02 20:46:42.634706026 +0200
+--- lsvpd-1.6.11/Makefile.am.orig      2011-06-16 00:59:59.000000000 +0200
++++ lsvpd-1.6.11/Makefile.am   2011-09-23 19:29:44.906120445 +0200

 @@ -40,7 +40,7 @@
  lsmcode_SOURCES = src/output/lsmcode.cpp \
                $(update_h_files)
  
 @@ -40,7 +40,7 @@
  lsmcode_SOURCES = src/output/lsmcode.cpp \
                $(update_h_files)
  

--vpdupdate_LDADD = -L. -lz -lstdc++ -lvpd_cxx -lsgutils
-+vpdupdate_LDADD = -L. -lz -lstdc++ -lvpd_cxx -lsgutils2
+-vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils
++vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils2

  vpdupdate_LDFLAGS = -Wall
  vpdupdate_LDFLAGS = -Wall

- lsvpd_LDADD = -L. -lz -lstdc++ -lvpd_cxx
+ lsvpd_LDADD = -lz -lstdc++ -lvpd_cxx

  lsvpd_LDFLAGS = -Wall
 @@ -53,25 +53,9 @@
  
  lsvpd_LDFLAGS = -Wall
 @@ -53,25 +53,9 @@
  


@@ -22,8 +22,7 @@
 -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/misc/pci.ids"'
 -endif
 -endif
 -AM_CXXFLAGS += -DPCI_IDS='"/usr/share/misc/pci.ids"'
 -endif
 -endif

-+AM_CXXFLAGS += -DPCI_IDS='"/etc/pci.ids"'
- 
+-

 -if USB_IDS_LOC
 -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/usb.ids"'
 -else
 -if USB_IDS_LOC
 -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/usb.ids"'
 -else


@@ -33,6 +32,8 @@
 -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"'
 -endif
 -endif
 -AM_CXXFLAGS += -DUSB_IDS='"/usr/share/misc/usb.ids"'
 -endif
 -endif

++AM_CXXFLAGS += -DPCI_IDS='"/etc/pci.ids"'
++

 +AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"'
  
  SUBDIRS = docs
 +AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"'
  
  SUBDIRS = docs

diff --git a/lsvpd-nortas.patch b/lsvpd-nortas.patch
new file mode 100644 (file)
index 0000000..1579d2c
--- /dev/null
+++ b/lsvpd-nortas.patch
@@ -0,0 +1,13 @@
+--- lsvpd-1.6.11/configure.in.orig     2011-07-22 10:11:41.000000000 +0200
++++ lsvpd-1.6.11/configure.in  2011-09-23 19:33:05.106127148 +0200
+@@ -27,9 +27,7 @@
+ AC_CHECK_HEADER([sqlite3.h],,[AC_MSG_ERROR([sqlite header files are required for building lsvpd])])
+ 
+ #libraries
+-AC_CHECK_LIB(rtas, rtas_get_vpd, [], [
+-                      echo "rtas library is required for lsvpd"
+-                      exit 1 ])
++AC_CHECK_LIB(rtas, rtas_get_vpd)
+ AC_CHECK_LIB(sqlite3, sqlite3_libversion_number, [], [ 
+                       echo "sqlite3 library is required for lsvpd"
+                       exit 1 ])

diff --git a/lsvpd.spec b/lsvpd.spec
index 5eb959074ec3abdcfc2f4520d13eea4d6361c2c1..8880114c3ba3cb77bf3cbbab5fad241762a07632 100644 (file)
--- a/lsvpd.spec
+++ b/lsvpd.spec
@@ -8,15 +8,16 @@
 Summary:       VPD/hardware inventory utilities for Linux
 Summary(pl.UTF-8):     Narzędzia do inwentaryzacji VPD/sprzętu dla Linuksa
 Name:          lsvpd
 Summary:       VPD/hardware inventory utilities for Linux
 Summary(pl.UTF-8):     Narzędzia do inwentaryzacji VPD/sprzętu dla Linuksa
 Name:          lsvpd

-Version:       1.6.10
+Version:       1.6.11

 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz

-# Source0-md5: 36b6378586c9566c18175d7612069e41
+# Source0-md5: 6d63c45af3efbac6fbc5dd01648d0f7f

 Source1:       vpdupdater.init
 Source2:       vpdupdater.sysconfig
 Patch0:                %{name}-make.patch
 Source1:       vpdupdater.init
 Source2:       vpdupdater.sysconfig
 Patch0:                %{name}-make.patch

+Patch1:                %{name}-nortas.patch

 URL:           http://linux-diag.sourceforge.net/Lsvpd.html
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://linux-diag.sourceforge.net/Lsvpd.html
 BuildRequires: autoconf
 BuildRequires: automake


@@ -55,6 +56,7 @@ wypisuje poziomy mikrokodu i firmware'u.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}