rpms/irda-utils/devel irda-utils-0.9.16-io.patch, NONE, 1.1 irda-utils.spec, 1.22, 1.23
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 3 09:14:22 UTC 2006
Author: karsten
Update of /cvs/dist/rpms/irda-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28241
Modified Files:
irda-utils.spec
Added Files:
irda-utils-0.9.16-io.patch
Log Message:
- don't use asm/io.h directly (Bastien Nocera #186875)
irda-utils-0.9.16-io.patch:
nsc.c | 2 +-
smc.c | 2 +-
winbond.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE irda-utils-0.9.16-io.patch ---
diff -upr irda-utils-0.9.16/findchip/nsc.c irda-utils-0.9.16.new/findchip/nsc.c
--- irda-utils-0.9.16/findchip/nsc.c 2003-07-07 21:33:37.000000000 -0400
+++ irda-utils-0.9.16.new/findchip/nsc.c 2006-03-24 07:16:14.000000000 -0500
@@ -33,7 +33,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -upr irda-utils-0.9.16/findchip/smc.c irda-utils-0.9.16.new/findchip/smc.c
--- irda-utils-0.9.16/findchip/smc.c 2003-07-07 21:33:37.000000000 -0400
+++ irda-utils-0.9.16.new/findchip/smc.c 2006-03-24 07:14:19.000000000 -0500
@@ -32,7 +32,7 @@
#include <string.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
diff -upr irda-utils-0.9.16/findchip/winbond.c irda-utils-0.9.16.new/findchip/winbond.c
--- irda-utils-0.9.16/findchip/winbond.c 2000-11-06 16:11:39.000000000 -0500
+++ irda-utils-0.9.16.new/findchip/winbond.c 2006-03-24 07:16:29.000000000 -0500
@@ -32,7 +32,7 @@
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-#include <asm/io.h>
+#include <sys/io.h>
#include "findchip.h"
Index: irda-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/irda-utils/devel/irda-utils.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- irda-utils.spec 11 Feb 2006 03:39:11 -0000 1.22
+++ irda-utils.spec 3 Apr 2006 09:14:19 -0000 1.23
@@ -1,7 +1,7 @@
Summary: Utilities for infrared communication between devices.
Name: irda-utils
Version: 0.9.16
-Release: 7.2.1
+Release: 8
Source: ftp://irda.sourceforge.net/pub/irda/irda-utils/irda-utils-%{version}.tar.gz
Patch1: irda-utils-0.9.14-chkconfig.patch
Patch2: irda-utils-0.9.14-typo.patch
@@ -10,12 +10,14 @@
Patch5: irda-utils-0.9.15-rh1.patch
Patch6: irda-utils-0.9.16-rh2.patch
Patch7: irda-utils-0.9.16-glib2.patch
+Patch8: irda-utils-0.9.16-io.patch
Url: http://irda.sourceforge.net/
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-root
Prereq: /sbin/chkconfig, grep, modutils >= 2.3.21-4
ExcludeArch: s390 s390x
+BuildRequires: glib2-devel
%description
IrDA(TM) (Infrared Data Association) is an industry standard for
@@ -43,6 +45,7 @@
%patch5 -p1 -b .rh1
%patch6 -p1 -b .rh2
%patch7 -p1 -b .glib2
+%patch8 -p1 -b .io
%build
make all RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ROOT="$RPM_BUILD_ROOT" CFLAGS="$RPM_OPT_FLAGS"
@@ -86,6 +89,9 @@
%doc tekram/README.tekram
%changelog
+* Mon Apr 03 2006 Karsten Hopp <karsten at redhat.de> 0.9.16-8
+- don't use asm/io.h directly (Bastien Nocera #186875)
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0.9.16-7.2.1
- bump again for double-long bug on ppc(64)
More information about the fedora-cvs-commits
mailing list