- let it find the right bzlib.h - bail out with exit(EXIT_FAILURE) instead of abort() (core dump)

bsdiff/bsdiff.patch

@@ -1,20 +1,6 @@
-Index: err.h
---- err.h.orig	2003-10-23 21:12:13.000000000 +0200
-+++ err.h	2003-10-23 21:13:10.000000000 +0200
-@@ -0,0 +1,10 @@
-+#ifndef __ERR_H__
-+#define __ERR_H__
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#define err(bla, ...)  { fprintf(stderr, __VA_ARGS__); abort(); }
-+#define errx(bla, ...) { fprintf(stderr, __VA_ARGS__); abort(); }
-+
-+#endif /* __ERR_H__ */
 Index: bsdiff.c
 --- bsdiff.c.orig	2005-08-17 00:13:52.000000000 +0200
-+++ bsdiff.c	2005-08-17 08:08:10.970297000 +0200
++++ bsdiff.c	2005-08-17 09:17:36.626825000 +0200
 @@ -31,12 +31,12 @@
  #include <sys/types.h>
  
@@ -31,7 +17,7 @@ Index: bsdiff.c
  
 Index: bspatch.c
 --- bspatch.c.orig	2005-08-17 00:14:00.000000000 +0200
-+++ bspatch.c	2005-08-17 08:08:39.136025000 +0200
++++ bspatch.c	2005-08-17 09:17:36.627758000 +0200
 @@ -32,9 +32,9 @@
  #include <stdlib.h>
  #include <stdio.h>
@@ -43,3 +29,17 @@ Index: bspatch.c
  
  static off_t offtin(u_char *buf)
  {
+Index: err.h
+--- /dev/null	2005-08-17 09:19:51.000000000 +0200
++++ err.h	2005-08-17 09:19:51.704744000 +0200
+@@ -0,0 +1,10 @@
++#ifndef __ERR_H__
++#define __ERR_H__
++
++#include <stdio.h>
++#include <stdlib.h>
++
++#define err(bla, ...)  { fprintf(stderr, __VA_ARGS__); fputs("\n", stderr); exit(EXIT_FAILURE); }
++#define errx(bla, ...) { fprintf(stderr, __VA_ARGS__); fputs("\n", stderr); exit(EXIT_FAILURE); }
++
++#endif /* __ERR_H__ */

bsdiff/bsdiff.spec

@@ -67,8 +67,8 @@ AutoReqProv:  no
     %patch -p0
 
 %build
-    %{l_cc} %{l_cflags -O} -I. -o bsdiff  bsdiff.c  %{l_ldflags} -lbz2
-    %{l_cc} %{l_cflags -O} -I. -o bspatch bspatch.c %{l_ldflags} -lbz2
+    %{l_cc} %{l_cppflags} %{l_cflags -O} -g -I. -o bsdiff  bsdiff.c  %{l_ldflags} -lbz2
+    %{l_cc} %{l_cppflags} %{l_cflags -O} -g -I. -o bspatch bspatch.c %{l_ldflags} -lbz2
 
 %install
     rm -rf $RPM_BUILD_ROOT