[ctdb] Update to ctdb version 2.5

[Jose A. Rivera]

commit 522d700387cfdbeaddcd8e4c19a985010d652d30
Author: Jose A. Rivera <jarrpa at redhat.com>
Date:   Fri Nov 1 16:26:31 2013 -0500

    Update to ctdb version 2.5

 .gitignore                     |    1 +
 ctdb-no_default_runlevel.patch |   18 +++++++++++++++---
 ctdb.spec                      |    6 ++++--
 sources                        |    2 +-
 use_var_lib.patch              |    7 +++++--
 5 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f102db6..4793799 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ ctdb-1.0.113.tar.bz2
 /ctdb-1.2.39.tar.bz2
 /ctdb-2.1.tar.gz
 /ctdb-2.4.tar.gz
+/ctdb-2.5.tar.gz
diff --git a/ctdb-no_default_runlevel.patch b/ctdb-no_default_runlevel.patch
index fc42b18..1f82b23 100644
--- a/ctdb-no_default_runlevel.patch
+++ b/ctdb-no_default_runlevel.patch
@@ -1,13 +1,25 @@
+From 4c82e441054729582dc7f28cc14aa8eeb0c5e322 Mon Sep 17 00:00:00 2001
+From: "Jose A. Rivera" <jarrpa at redhat.com>
+Date: Fri, 1 Nov 2013 15:55:13 -0500
+Subject: [PATCH] No default runlevel
+
+---
+ config/ctdb.init | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/config/ctdb.init b/config/ctdb.init
-index e761fec..2f4acb1 100755
+index 0e0d379..5fac7ab 100755
 --- a/config/ctdb.init
 +++ b/config/ctdb.init
 @@ -12,7 +12,7 @@
  # Provides:            ctdb
- # Required-Start:      $local_fs $syslog $network
- # Required-Stop:       $local_fs $syslog $network
+ # Required-Start:      $local_fs $syslog $network $remote_fs
+ # Required-Stop:       $local_fs $syslog $network $remote_fs
 -# Default-Start:       2 3 4 5
 +# Default-Start:       
  # Default-Stop:        0 1 6
  # Short-Description:   start and stop ctdb service
  # Description:         Start and stop CTDB (Clustered TDB daemon)
+-- 
+1.8.3.1
+
diff --git a/ctdb.spec b/ctdb.spec
index c1aed62..377ad5b 100644
--- a/ctdb.spec
+++ b/ctdb.spec
@@ -5,7 +5,7 @@
 
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 Name: ctdb
-Version: 2.4
+Version: 2.5
 Release: 1%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
@@ -250,7 +250,6 @@ fi
 %{_includedir}/ctdb_protocol.h
 %{_includedir}/ctdb_private.h
 %{_includedir}/ctdb_typesafe_cb.h
-%{_libdir}/libctdb.a
 %{_libdir}/pkgconfig/ctdb.pc
 
 %files tests
@@ -264,6 +263,9 @@ fi
 %doc tests/README
 
 %changelog
+* Fri Nov 01 2013 Jose A. Rivera <jarrpa at redhat.com> - 2.5-1
+- Update to ctdb version 2.5
+
 * Fri Aug 23 2013 Sumit Bose <sbose at redhat.com> - 2.4-1
 - Update to ctdb version 2.4
   Resolves: rhbz#1000471
diff --git a/sources b/sources
index 69d8ca6..1402fdd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cfd24a056f0dbffc8ca64a2373f084c  ctdb-2.4.tar.gz
+274db3a1ec3858092ec7dc960bfd0c40  ctdb-2.5.tar.gz
diff --git a/use_var_lib.patch b/use_var_lib.patch
index c51b07e..5b08b82 100644
--- a/use_var_lib.patch
+++ b/use_var_lib.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.in b/Makefile.in
-index 41bdb7e..da5f598 100755
+index 55b21b7..9340fdc 100755
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -64,7 +64,7 @@ endif
@@ -8,6 +8,9 @@ index 41bdb7e..da5f598 100755
         $(TALLOC_CFLAGS) $(TEVENT_CFLAGS) $(TDB_CFLAGS) -I at libreplacedir@ \
 -	-DVARDIR=\"$(localstatedir)\" -DETCDIR=\"$(etcdir)\" \
 +	-DVARDIR=\"$(localstatedir)/lib\" -DETCDIR=\"$(etcdir)\" \
+ 	-DCTDB_VARDIR=\"$(localstatedir)/lib/ctdb\" \
  	-DLOGDIR=\"$(logdir)\" -DBINDIR=\"$(bindir)\" \
  	-DSOCKPATH=\"$(sockpath)\" \
- 	-DUSE_MMAP=1 @CFLAGS@ $(POPT_CFLAGS) \
+-- 
+1.8.3.1
+