- rel 1; builds fine

Changed files:
    bacula-64bitbuild_fix.patch -> 1.2
    bacula-tinfo-readline.patch -> 1.5
    bacula.spec -> 1.143

diff --git a/bacula-64bitbuild_fix.patch b/bacula-64bitbuild_fix.patch
deleted file mode 100644 (file)
index 6681140..0000000
--- a/bacula-64bitbuild_fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- bacula-3.0.0/autoconf/bacula-macros/db.m4.orig     2009-04-20 13:02:06.530168885 +0200
-+++ bacula-3.0.0/autoconf/bacula-macros/db.m4  2009-04-20 13:05:42.299890921 +0200
-@@ -35,26 +35,18 @@
-            AC_MSG_RESULT(no)
-            AC_MSG_ERROR(Unable to find dbi.h in standard locations)
-         fi
--        if test -d /usr/local/lib/dbd; then
-+        if test -d /usr/local/lib64/dbd; then
-+           DRIVERDIR=/usr/local/lib64/dbd
-+        elif test -d /usr/local/lib/dbd; then
-            DRIVERDIR=/usr/local/lib/dbd
--           if test -d /usr/local/lib64/dbd; then
--              DRIVERDIR=/usr/local/lib64/dbd
--           else
--              DRIVERDIR=/usr/local/lib/dbd
--           fi
-+        elif test -d /usr/lib64/dbd; then
-+           DRIVERDIR=/usr/lib64/dbd
-         elif test -d /usr/lib/dbd; then
-            DRIVERDIR=/usr/lib/dbd
--           if test -d /usr/lib64/dbd; then
--              DRIVERDIR=/usr/lib64/dbd
--           else
--              DRIVERDIR=/usr/lib/dbd
--           fi
-+        elif test -d $prefix/lib64/dbd; then
-+           DRIVERDIR=$prefix/lib64/dbd
-         elif test -d $prefix/lib/dbd; then
--           if test -d $prefix/lib64/dbd; then
--              DRIVERDIR=$prefix/lib64/dbd
--           else
--              DRIVERDIR=$prefix/lib/dbd
--           fi
-+           DRIVERDIR=$prefix/lib/dbd
-         else
-            AC_MSG_RESULT(no)
-            AC_MSG_ERROR(Unable to find DBD drivers in standard locations)

diff --git a/bacula-tinfo-readline.patch b/bacula-tinfo-readline.patch
index cd9d2017897ca17ff20459603f91573abc59d455..26ada59f598f41eb470a16b4cdb558af317d339f 100644 (file)
--- a/bacula-tinfo-readline.patch
+++ b/bacula-tinfo-readline.patch
@@ -1,42 +1,15 @@
---- bacula-3.0.0/autoconf/configure.in.orig    2009-04-07 16:07:30.000000000 +0000
-+++ bacula-3.0.0/autoconf/configure.in 2009-04-10 22:28:47.948114014 +0000
-@@ -776,9 +776,9 @@
+--- 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 @@
+ fi
  
- got_conio="no"
- if test x$support_conio = xyes; then
--   AC_CHECK_HEADER(termcap.h, 
--     [ AC_CHECK_LIB(termcap, tgetent, 
--       [ CONS_LIBS="-ltermcap"
-+   AC_CHECK_HEADER(ncurses.h, 
-+     [ AC_CHECK_LIB(tinfo, tgetent, 
-+       [ CONS_LIBS="-ltinfo"
-     CONS_OBJ="conio.o"
-     CONS_SRC="conio.c"
-     got_conio="yes"
-@@ -854,7 +854,7 @@
-            AC_CHECK_HEADER(${with_readline}/readline.h, 
-               [
-                   AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
--                  CONS_LIBS="-lreadline -lhistory -ltermcap"
-+                  CONS_LIBS="-lreadline -lhistory"
-                   got_readline="yes"   
-               ], [
-                   echo " "
-@@ -871,7 +871,7 @@
-               AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
-               got_readline="yes"
-               CONS_INC="-I/usr/include/readline"
--              CONS_LIBS="-lreadline -ltermcap"
-+              CONS_LIBS="-lreadline"
-           ], [
-               dnl Did not find standard library, so try Bacula's default
-               AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, 
-@@ -879,7 +879,7 @@
-                       AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support])
-                       got_readline="yes"   
-                       CONS_INC="-I${TOP_DIR}/depkgs/readline"
--                      CONS_LIBS="-lreadline -lhistory -ltermcap"
-+                      CONS_LIBS="-lreadline -lhistory"
-                       CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline"
-                       PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline"
-                   ], [
+ 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" ])
+     ])
+   ],

diff --git a/bacula.spec b/bacula.spec
index 4ee626d1523c8710b34aaea8980ad322ccaf61fe..20ac6d772ec35e378ca979beb7ebb44be54e8a63 100644 (file)
--- a/bacula.spec
+++ b/bacula.spec
@@ -27,7 +27,7 @@ Summary:      Bacula - The Network Backup Solution
 Summary(pl.UTF-8):     Bacula - rozwiązanie do wykonywania kopii zapasowych po sieci
 Name:          bacula
 Version:       5.0.2
-Release:       0.1
+Release:       1
 License:       extended GPL v2
 Group:         Networking/Utilities
 Source0:       http://downloads.sourceforge.net/bacula/%{name}-%{version}.tar.gz
@@ -49,7 +49,6 @@ Patch2:               %{name}-tinfo-readline.patch
 Patch3:                %{name}-branding.patch
 Patch4:                %{name}-conf.patch
 Patch5:                %{name}-desktop.patch
-Patch6:                %{name}-64bitbuild_fix.patch
 Patch7:                %{name}-dbi_fixes.patch
 Patch8:                %{name}-dbi_dbcheck.patch
 Patch9:                %{name}-openssl1.patch
@@ -460,11 +459,10 @@ Nagios plugin to check bacula.
 %setup -q -a 1
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1 CHECKME
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1