From 154d0ad7ebf5a8153d99057dce72ddd27cab7cdc Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 12 Jun 2012 12:21:44 +0200 Subject: [PATCH 1/2] Update to 5.2.9 --- .gitignore | 1 + bacula.spec | 9 +++++---- sources | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7733d23..aff7db1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ bacula-docs-5.0.3.tar.bz2 /bacula-5.2.6.tar.gz /bacula-5.2.7.tar.gz /bacula-5.2.8.tar.gz +/bacula-5.2.9.tar.gz diff --git a/bacula.spec b/bacula.spec index 71a80b6..d86b053 100644 --- a/bacula.spec +++ b/bacula.spec @@ -2,8 +2,8 @@ %global username bacula Name: bacula -Version: 5.2.8 -Release: 2%{?dist} +Version: 5.2.9 +Release: 1%{?dist} Summary: Cross platform network backup for Linux, Unix, Mac and Windows # See LICENSE for details License: AGPLv3 with exceptions @@ -33,7 +33,6 @@ Patch2: bacula-5.2.2-queryfile.patch Patch3: bacula-5.2.4-log-path.patch Patch4: bacula-5.0.3-sqlite-priv.patch Patch5: bacula-5.2.7-bat-build.patch -Patch6: bacula-5.2.8-restore-termlib.patch BuildRequires: desktop-file-utils BuildRequires: perl @@ -292,7 +291,6 @@ Provides check_bacula support for Nagios. %patch3 -p1 -b .log-path %patch4 -p0 -b .priv %patch5 -p1 -b .bat-build -%patch6 -p1 -b .restore-termlib # Remove execution permissions from files we're packaging as docs later on find updatedb -type f | xargs chmod -x @@ -845,6 +843,9 @@ fi %changelog +* Tue Jun 12 2012 Simone Caronni - 5.2.9-1 +- Update to 5.2.9, remove termlib patch. + * Mon Jun 11 2012 Simone Caronni - 5.2.8-2 - Fix console build on RHEL 5. diff --git a/sources b/sources index 0aa043d..ae0defe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -abf815dae588ab102421477a77422a3d bacula-5.2.8.tar.gz +41a5dc0383da4fda3bc19bec619297ea bacula-5.2.9.tar.gz From ba4f32794986623142ad1cddfc6dae04fb2d8138 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 12 Jun 2012 12:22:51 +0200 Subject: [PATCH 2/2] Remove upstream patch --- bacula-5.2.8-restore-termlib.patch | 80 ------------------------------ 1 file changed, 80 deletions(-) delete mode 100644 bacula-5.2.8-restore-termlib.patch diff --git a/bacula-5.2.8-restore-termlib.patch b/bacula-5.2.8-restore-termlib.patch deleted file mode 100644 index a1ae163..0000000 --- a/bacula-5.2.8-restore-termlib.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur bacula-5.2.8.old/autoconf/configure.in bacula-5.2.8/autoconf/configure.in ---- bacula-5.2.8.old/autoconf/configure.in 2012-06-10 12:00:42.000000000 +0200 -+++ bacula-5.2.8/autoconf/configure.in 2012-06-11 14:34:41.612673957 +0200 -@@ -854,6 +854,9 @@ - fi - ] - ) -+if test x$TERM_LIB = x ; then -+ support_readline=no -+fi - - got_readline="no" - READLINE_SRC= -@@ -880,7 +883,7 @@ - AC_CHECK_HEADER(${with_readline}/readline.h, - [ - AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support]) -- CONS_LIBS="-lreadline -lhistory" -+ CONS_LIBS="-lreadline -lhistory $TERM_LIB" - got_readline="yes" - ], [ - echo " " -@@ -897,7 +900,7 @@ - AC_DEFINE(HAVE_READLINE, 1, [Set to enable readline support]) - got_readline="yes" - CONS_INC="-I/usr/include/readline" -- CONS_LIBS="-lreadline" -+ CONS_LIBS="-lreadline $TERM_LIB" - ], [ - dnl Did not find standard library, so try Bacula's default - AC_CHECK_HEADER(${TOP_DIR}/depkgs/readline/readline.h, -@@ -905,7 +908,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" -+ CONS_LIBS="-lreadline -lhistory $TERM_LIB" - CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline" - PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline" - ], [ -diff -Naur bacula-5.2.8.old/configure bacula-5.2.8/configure ---- bacula-5.2.8.old/configure 2012-06-10 12:00:42.000000000 +0200 -+++ bacula-5.2.8/configure 2012-06-11 14:47:45.700775708 +0200 -@@ -22352,6 +22352,9 @@ - - fi - -+if test x$TERM_LIB = x ; then -+ support_readline=no -+fi - - got_readline="no" - READLINE_SRC= -@@ -22383,7 +22386,7 @@ - - $as_echo "#define HAVE_READLINE 1" >>confdefs.h - -- CONS_LIBS="-lreadline -lhistory" -+ CONS_LIBS="-lreadline -lhistory $TERM_LIB" - got_readline="yes" - - else -@@ -22409,7 +22412,7 @@ - - got_readline="yes" - CONS_INC="-I/usr/include/readline" -- CONS_LIBS="-lreadline" -+ CONS_LIBS="-lreadline $TERM_LIB" - - else - -@@ -22422,7 +22425,7 @@ - - got_readline="yes" - CONS_INC="-I${TOP_DIR}/depkgs/readline" -- CONS_LIBS="-lreadline -lhistory" -+ CONS_LIBS="-lreadline -lhistory $TERM_LIB" - CONS_LDFLAGS="-L${TOP_DIR}/depkgs/readline" - PRTREADLINE_SRC="${TOP_DIR}/depkgs/readline" -