packages: lsvpd/lsvpd-make.patch, lsvpd/lsvpd.spec, lsvpd/lsvpd-nortas.patc...

qboosh qboosh at pld-linux.org
Fri Sep 23 19:42:47 CEST 2011


Author: qboosh                       Date: Fri Sep 23 17:42:47 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.6.11
- updated make patch
- added nortas patch to allow archs other than ppc

---- Files affected:
packages/lsvpd:
   lsvpd-make.patch (1.3 -> 1.4) , lsvpd.spec (1.30 -> 1.31) , lsvpd-nortas.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/lsvpd/lsvpd-make.patch
diff -u packages/lsvpd/lsvpd-make.patch:1.3 packages/lsvpd/lsvpd-make.patch:1.4
--- packages/lsvpd/lsvpd-make.patch:1.3	Tue May  3 10:51:50 2011
+++ packages/lsvpd/lsvpd-make.patch	Fri Sep 23 19:42:42 2011
@@ -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)
  
--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
- lsvpd_LDADD = -L. -lz -lstdc++ -lvpd_cxx
+ lsvpd_LDADD = -lz -lstdc++ -lvpd_cxx
  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='"/etc/pci.ids"'
- 
+-
 -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 += -DPCI_IDS='"/etc/pci.ids"'
++
 +AM_CXXFLAGS += -DUSB_IDS='"/etc/usb.ids"'
  
  SUBDIRS = docs

================================================================
Index: packages/lsvpd/lsvpd.spec
diff -u packages/lsvpd/lsvpd.spec:1.30 packages/lsvpd/lsvpd.spec:1.31
--- packages/lsvpd/lsvpd.spec:1.30	Tue May  3 10:51:50 2011
+++ packages/lsvpd/lsvpd.spec	Fri Sep 23 19:42:42 2011
@@ -9,15 +9,16 @@
 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
-# Source0-md5:	36b6378586c9566c18175d7612069e41
+# Source0-md5:	6d63c45af3efbac6fbc5dd01648d0f7f
 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
@@ -56,6 +57,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -117,6 +119,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/09/23 17:42:42  qboosh
+- updated to 1.6.11
+- updated make patch
+- added nortas patch to allow archs other than ppc
+
 Revision 1.30  2011/05/03 08:51:50  qboosh
 - updated usb.ids path in make patch
 - require {pci,usb}.ids in expected location

================================================================
Index: packages/lsvpd/lsvpd-nortas.patch
diff -u /dev/null packages/lsvpd/lsvpd-nortas.patch:1.1
--- /dev/null	Fri Sep 23 19:42:47 2011
+++ packages/lsvpd/lsvpd-nortas.patch	Fri Sep 23 19:42:42 2011
@@ -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 ])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lsvpd/lsvpd-make.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lsvpd/lsvpd.spec?r1=1.30&r2=1.31&f=u



More information about the pld-cvs-commit mailing list