rpms/lrmi/devel lrmi-0.10-newheaders.patch, NONE, 1.1 lrmi.spec, 1.11, 1.12

[Tom Callaway]

Author: spot

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

Modified Files:
	lrmi.spec 
Added Files:
	lrmi-0.10-newheaders.patch 
Log Message:
fix FTBFS

lrmi-0.10-newheaders.patch:

--- NEW FILE lrmi-0.10-newheaders.patch ---
diff -up lrmi-0.10/lrmi.c.BAD lrmi-0.10/lrmi.c
--- lrmi-0.10/lrmi.c.BAD	2008-09-17 14:41:28.000000000 -0400
+++ lrmi-0.10/lrmi.c	2008-09-17 14:45:17.000000000 -0400
@@ -239,7 +239,7 @@ LRMI_free_real(void *m)
 
 
 #if defined(__linux__)
-#define DEFAULT_VM86_FLAGS 	(IF_MASK | IOPL_MASK)
+#define DEFAULT_VM86_FLAGS 	(X86_EFLAGS_IF | X86_EFLAGS_IOPL)
 #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 #define DEFAULT_VM86_FLAGS  (PSL_I | PSL_IOPL)
 #define TF_MASK         PSL_T
@@ -822,7 +822,7 @@ run_vm86(void)
 
 			CONTEXT_REGS.REG(cs) = get_int_seg(v);
 			CONTEXT_REGS.REG(eip) = get_int_off(v);
-			CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
+			CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
 
 			continue;
 		}
@@ -862,7 +862,7 @@ vm86_callback(int sig, int code, struct 
 
 			CONTEXT_REGS.REG(cs) = get_int_seg(v);
 			CONTEXT_REGS.REG(eip) = get_int_off(v);
-			CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
+			CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
 
 			break;
 		}
@@ -916,7 +916,7 @@ vm86_callback(int sig, int code, struct 
 
 		CONTEXT_REGS.REG(cs) = get_int_seg(addr[1]);
 		CONTEXT_REGS.REG(eip) = get_int_off(addr[1]);
-		CONTEXT_REGS.REG(eflags) &= ~(VIF_MASK | TF_MASK);
+		CONTEXT_REGS.REG(eflags) &= ~(X86_EFLAGS_VIF | X86_EFLAGS_TF);
 	} else {
 		if (emulate() == 0) {
 			context.success = 0;


Index: lrmi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lrmi/devel/lrmi.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lrmi.spec	10 Feb 2008 18:37:28 -0000	1.11
+++ lrmi.spec	17 Sep 2008 18:55:15 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lrmi
 Version:        0.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Library for calling real mode BIOS routines
 
 Group:          System Environment/Libraries
@@ -8,7 +8,9 @@
 URL:            http://sourceforge.net/projects/lrmi/
 Source0:        http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.9-build.patch
+Patch1:         lrmi-0.10-newheaders.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  kernel-headers
 
 ExclusiveArch:  %{ix86}
 Provides:       lib%{name} = %{version}-%{release}
@@ -36,6 +38,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -p1 -b .new-headers
 
 
 %build
@@ -75,6 +78,10 @@
 
 
 %changelog
+* Wed Sep 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10-5
+- fix compile against modern kernel headers
+- add BR: kernel-headers
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 0.10-4
 - Rebuild for gcc43