rpms/iprutils/devel iprutils-swab-moved.patch, NONE, 1.1 iprutils-initscripts.patch, 1.3, 1.4 iprutils.spec, 1.35, 1.36

[Joshua W. Boyer]

Author: jwboyer

Update of /cvs/pkgs/rpms/iprutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16816

Modified Files:
	iprutils-initscripts.patch iprutils.spec 
Added Files:
	iprutils-swab-moved.patch 
Log Message:
* Mon Feb 2 2009 Will Woods <wwoods at redhat.com> - 2.2.13-2
- Fix iprdump startup - #483340
- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643)


iprutils-swab-moved.patch:

--- NEW FILE iprutils-swab-moved.patch ---
diff -up iprutils/iprlib.h.swab-moved iprutils/iprlib.h
--- iprutils/iprlib.h.swab-moved	2009-02-02 13:07:44.118559632 -0500
+++ iprutils/iprlib.h	2009-02-02 13:07:58.318558756 -0500
@@ -43,7 +43,7 @@
 #include <stdbool.h>
 #include <netinet/in.h>
 #include <sysfs/libsysfs.h>
-#include <linux/byteorder/swab.h>
+#include <linux/swab.h>
 #include <asm/byteorder.h>
 #include <sys/mman.h>
 #include <paths.h>

iprutils-initscripts.patch:

Index: iprutils-initscripts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/iprutils/devel/iprutils-initscripts.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iprutils-initscripts.patch	21 Nov 2008 13:23:41 -0000	1.3
+++ iprutils-initscripts.patch	2 Feb 2009 18:38:04 -0000	1.4
@@ -35,7 +35,7 @@
 -    start_daemon $IPRDUMP --daemon
 -
 +    
-+    daemon $iprdump
++    daemon $iprdump --daemon
      RETVAL=$?
 -    if [ $RETVAL -eq 0 ]; then
 -	log_success_msg " "


Index: iprutils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/iprutils/devel/iprutils.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- iprutils.spec	21 Nov 2008 13:23:41 -0000	1.35
+++ iprutils.spec	2 Feb 2009 18:38:05 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: Utilities for the IBM Power Linux RAID adapters
 Name:    iprutils
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: CPL
 Group:   System Environment/Base
 URL:     http://sourceforge.net/projects/iprdd/
@@ -10,6 +10,7 @@
 Patch0:  %{name}-cflags.patch
 #Patch1:  %{name}-lsb-init-ectomy.patch
 Patch2: %{name}-initscripts.patch
+Patch3: iprutils-swab-moved.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExclusiveArch: ppc ppc64
 
@@ -19,6 +20,7 @@
 BuildRequires: pciutils-devel
 BuildRequires: ncurses-devel
 BuildRequires: libcap-devel
+BuildRequires: kernel-devel
 
 Obsoletes: ipr-utils
 
@@ -31,6 +33,7 @@
 %patch0 -p1
 #%patch1 -p1
 %patch2 -p1
+%patch3 -p1 -b .swab-moved
 %build
 CFLAGS="%{optflags}" %{__make}
 
@@ -64,6 +67,10 @@
 %{_sysconfdir}/rc.d/init.d/*
 
 %changelog
+* Mon Feb 2 2009 Will Woods <wwoods at redhat.com> - 2.2.13-2
+- Fix iprdump startup - #483340
+- iprutils-swab-moved.patch - fix compilation with 2.6.29 kernels (#483643)
+
 * Fri Nov 21 2008 Roman Rakus <rrakus at redhat.com> - 2.2.13-1
 - New upstream version