- re-add updated tinfo patch

Changed files:
    bacula-tinfo-readline.patch -> 1.6
    bacula.spec -> 1.148

diff --git a/bacula-tinfo-readline.patch b/bacula-tinfo-readline.patch
index 26ada59f598f41eb470a16b4cdb558af317d339f..fa2c31d587ccdc91f5b56755cf77879899ac07fb 100644 (file)
--- a/bacula-tinfo-readline.patch
+++ b/bacula-tinfo-readline.patch
@@ -1,15 +1,19 @@
---- bacula-5.0.2/autoconf/configure.in~        2010-04-27 21:58:29.000000000 +0200
-+++ bacula-5.0.2/autoconf/configure.in 2010-06-05 23:28:52.980602282 +0200
-@@ -818,9 +818,9 @@
+--- bacula-5.0.3/autoconf/configure.in~        2010-08-05 17:29:51.000000000 +0300
++++ bacula-5.0.3/autoconf/configure.in 2010-08-22 18:48:37.975555296 +0300
+@@ -813,11 +813,12 @@
  fi
  
  TERM_LIB=""
--AC_CHECK_HEADER(termcap.h, 
--  [ AC_CHECK_LIB(termcap, tgetent, 
--    [ TERM_LIB="-ltermcap" ],
-+AC_CHECK_HEADER(ncurses.h, 
-+  [ AC_CHECK_LIB(tinfo, tgetent, 
-+    [ TERM_LIB="-ltinfo" ],
-     [ AC_CHECK_LIB(ncurses, tgetent, [ TERM_LIB="-lncurses" ])
+-AC_CHECK_HEADER(curses.h, 
+-  [ AC_CHECK_LIB(ncurses, tgetent, 
+-    [ TERM_LIB="-lncurses" ],
+-    [ AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ])
++AC_CHECK_HEADER(curses.h, [
++  AC_CHECK_LIB(tinfo, tgetent, [ TERM_LIB="-ltinfo" ], [
++   AC_CHECK_LIB(ncurses, tgetent, [ TERM_LIB="-lncurses" ], [
++    AC_CHECK_LIB(termcap, tgetent, [ TERM_LIB="-ltermcap" ])
      ])
++  ])
    ],
+   [  AC_CHECK_HEADERS(curses.h)
+      AC_CHECK_HEADER(term.h,

diff --git a/bacula.spec b/bacula.spec
index a6652e9be138ccdbe4dd6cbae29d8c7d2e03a9fa..bc7b416b0a312871bc42ff07dc053efed00c76d1 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -459,7 +459,7 @@ Nagios plugin to check bacula.
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p0
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1