rpms/hplip/devel hplip-no-asm.patch,1.1,1.2 hplip.spec,1.229,1.230

[Tim Waugh]

Author: twaugh

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

Modified Files:
	hplip-no-asm.patch hplip.spec 
Log Message:
* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
- Removed never-used definition of BREAKPOINT in scan/sane/common.h
  in hope of fixing the build.


hplip-no-asm.patch:
 ip/ipmain.c        |    3 ---
 ip/xfax.c          |   13 -------------
 scan/sane/common.h |    2 --
 3 files changed, 18 deletions(-)

Index: hplip-no-asm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-no-asm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- hplip-no-asm.patch	19 Aug 2009 10:38:56 -0000	1.1
+++ hplip-no-asm.patch	25 Aug 2009 15:36:33 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up hplip-3.9.8/ip/ipmain.c.no-asm hplip-3.9.8/ip/ipmain.c
---- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-19 11:35:39.770825475 +0100
-+++ hplip-3.9.8/ip/ipmain.c	2009-08-19 11:36:25.767828346 +0100
+--- hplip-3.9.8/ip/ipmain.c.no-asm	2009-08-04 22:37:28.000000000 +0100
++++ hplip-3.9.8/ip/ipmain.c	2009-08-25 14:44:04.497202437 +0100
 @@ -265,9 +265,6 @@ static IP_XFORM_TBL * const xformJumpTab
  void fatalBreakPoint (void)
  {
@@ -12,8 +12,8 @@ diff -up hplip-3.9.8/ip/ipmain.c.no-asm 
  }
  
 diff -up hplip-3.9.8/ip/xfax.c.no-asm hplip-3.9.8/ip/xfax.c
---- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-19 11:35:45.484827783 +0100
-+++ hplip-3.9.8/ip/xfax.c	2009-08-19 11:36:39.815701961 +0100
+--- hplip-3.9.8/ip/xfax.c.no-asm	2009-08-04 22:37:28.000000000 +0100
++++ hplip-3.9.8/ip/xfax.c	2009-08-25 14:44:04.502202418 +0100
 @@ -1680,19 +1680,6 @@ static BOOL bits_flush_to_eol (
                   & ((1u<<n_bits) - 1u);                                      \
  }
@@ -34,3 +34,16 @@ diff -up hplip-3.9.8/ip/xfax.c.no-asm hp
  
  
  
+diff -up hplip-3.9.8/scan/sane/common.h.no-asm hplip-3.9.8/scan/sane/common.h
+--- hplip-3.9.8/scan/sane/common.h.no-asm	2009-08-25 16:35:14.577203106 +0100
++++ hplip-3.9.8/scan/sane/common.h	2009-08-25 16:35:29.948216281 +0100
+@@ -53,8 +53,6 @@
+ 
+ #define BACKEND_NAME hpaio
+ 
+-#define BREAKPOINT __asm( "int3" )
+-
+ #define OK 1
+ #define ERROR 0
+ #define MAX_LIST_SIZE 32
+diff -up hplip-3.9.8/scan/sane/hpaio.c.no-asm hplip-3.9.8/scan/sane/hpaio.c


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -p -r1.229 -r1.230
--- hplip.spec	25 Aug 2009 14:57:55 -0000	1.229
+++ hplip.spec	25 Aug 2009 15:36:33 -0000	1.230
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 3.9.8
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -337,6 +337,10 @@ fi
 exit 0
 
 %changelog
+* Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-10
+- Removed never-used definition of BREAKPOINT in scan/sane/common.h
+  in hope of fixing the build.
+
 * Tue Aug 25 2009 Tim Waugh <twaugh at redhat.com> 3.9.8-9
 - New common sub-package for udev rules and config file (bug #516459).
 - Don't install base/*.py with executable bit set.