Author: arekm Date: Sat Jun 5 21:37:56 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 1; builds fine
---- Files affected:
packages/bacula:
bacula-tinfo-readline.patch (1.4 -> 1.5) , bacula.spec (1.142 -> 1.143) ,
bacula-64bitbuild_fix.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/bacula/bacula-tinfo-readline.patch
diff -u packages/bacula/bacula-tinfo-readline.patch:1.4
packages/bacula/bacula-tinfo-readline.patch:1.5
--- packages/bacula/bacula-tinfo-readline.patch:1.4 Sat Apr 11 00:39:44 2009
+++ packages/bacula/bacula-tinfo-readline.patch Sat Jun 5 23:37:50 2010
@@ -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" ])
+ ])
+ ],
================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.142 packages/bacula/bacula.spec:1.143
--- packages/bacula/bacula.spec:1.142 Thu Jun 3 04:23:10 2010
+++ packages/bacula/bacula.spec Sat Jun 5 23:37:50 2010
@@ -28,7 +28,7 @@
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
@@ -50,7 +50,6 @@
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
@@ -461,11 +460,10 @@
%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
@@ -1054,6 +1052,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.143 2010/06/05 21:37:50 arekm
+- rel 1; builds fine
+
Revision 1.142 2010/06/03 02:23:10 sparky
- BR: gtk+2-devel, python-modules, rpm-pythonprov, which
- dropped BR: mtx, qwt-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula-tinfo-readline.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.142&r2=1.143&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
