rpms/lsvpd
5
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to latest upstream 1.6.11

Browse Source
This commit is contained in:
Jiri Skala 2011-08-10 11:11:16 +02:00
parent 18277d0294
commit 27738ba53a
4 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
lsvpd-1.6.8.tar.gz lsvpd-1.6.8.tar.gz
/lsvpd-1.6.10.tar.gz /lsvpd-1.6.10.tar.gz
/lsvpd-1.6.11.tar.gz

26
lsvpd-1.6.10-sg3_utils.patch
View File

@ -1,24 +1,12 @@
diff -Nru lsvpd-1.6.4.orig/Makefile.am lsvpd-1.6.4/Makefile.am diff -up lsvpd-1.6.11/Makefile.am.sg3_utils lsvpd-1.6.11/Makefile.am
--- lsvpd-1.6.4.orig/Makefile.am 2008-03-12 21:14:32.000000000 +0100 --- lsvpd-1.6.11/Makefile.am.sg3_utils 2011-06-16 00:59:59.000000000 +0200
+++ lsvpd-1.6.4/Makefile.am 2008-06-30 19:43:44.000000000 +0200 +++ lsvpd-1.6.11/Makefile.am 2011-08-10 10:46:56.621688630 +0200
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@ lsvio_SOURCES = src/output/lsvio.cpp \
lsmcode_SOURCES = src/output/lsmcode.cpp \ lsmcode_SOURCES = src/output/lsmcode.cpp \
$(update_h_files) $(update_h_files)
-vpdupdate_LDADD = -L. -lz -lstdc++ -lvpd_cxx -lsgutils -vpdupdate_LDADD = -lz -lstdc++ -lvpd_cxx -lsgutils
+vpdupdate_LDADD = -L. -lz -lstdc++ -lvpd_cxx -lsgutils2 +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
diff -Nru lsvpd-1.6.4.orig/Makefile.in lsvpd-1.6.4/Makefile.in
--- lsvpd-1.6.4.orig/Makefile.in 2008-04-25 23:23:11.000000000 +0200
+++ lsvpd-1.6.4/Makefile.in 2008-06-30 19:43:54.000000000 +0200
@@ -239,7 +239,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_LDFLAGS = -Wall
lsvpd_LDADD = -L. -lz -lstdc++ -lvpd_cxx
lsvpd_LDFLAGS = -Wall lsvpd_LDFLAGS = -Wall

16
lsvpd.spec
View File

@ -1,5 +1,5 @@
%define name lsvpd %define name lsvpd
%define version 1.6.10 %define version 1.6.11
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -13,7 +13,7 @@ Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz
Patch1: lsvpd-1.6.7-ids-lookup.patch Patch1: lsvpd-1.6.7-ids-lookup.patch
Patch2: lsvpd-1.6.10-sg3_utils.patch Patch2: lsvpd-1.6.10-sg3_utils.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libvpd-devel >= 2.1.2 BuildRequires: libvpd-devel >= 2.1.3
BuildRequires: sg3_utils-devel zlib-devel automake libtool BuildRequires: sg3_utils-devel zlib-devel automake libtool
Requires(post): /usr/sbin/vpdupdate Requires(post): /usr/sbin/vpdupdate
@ -21,13 +21,8 @@ Requires(post): /usr/sbin/vpdupdate
# librtas is now part of Fedora, lsvpd provides much more information with # librtas is now part of Fedora, lsvpd provides much more information with
# librtas on POWER # librtas on POWER
#%{!?_with_librtas: %{!?_without_librtas: %define _without_librtas --without-librtas }} %ifarch ppc ppc64
BuildRequires: librtas-devel
%ifarch ppc
%{?_with_librtas:BuildRequires: librtas-devel }
%endif
%ifarch ppc64
%{?_with_librtas:BuildRequires: librtas-devel }
%endif %endif
%description %description
@ -78,6 +73,9 @@ on POWER PC based systems.
%dir %{_sysconfdir}/lsvpd %dir %{_sysconfdir}/lsvpd
%changelog %changelog
* Wed Aug 10 2011 Jiri Skala <jskala@redhat.com> - 1.6.11-1
- rebase to latest upstream 1.6.11
* Tue Feb 15 2011 Jiri Skala <jskala@redhat.com> - 1.6.10-1 * Tue Feb 15 2011 Jiri Skala <jskala@redhat.com> - 1.6.10-1
- rebase to latest upstream 1.6.10 - rebase to latest upstream 1.6.10

2
sources
View File

@ -1 +1 @@
36b6378586c9566c18175d7612069e41 lsvpd-1.6.10.tar.gz 6d63c45af3efbac6fbc5dd01648d0f7f lsvpd-1.6.11.tar.gz