From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 14 Jul 2013 05:09:26 +0000 (+0200)
Subject: - updated to 2.3
X-Git-Tag: auto/th/ctdb-2.3-1~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=fc43d07129bb2f245e40f1333516a8b9651f723c;p=packages%2Fctdb.git

- updated to 2.3
- updated ib patch
---

diff --git a/ctdb-ib.patch b/ctdb-ib.patch
index 8b2e3d4..c8271cf 100644
--- a/ctdb-ib.patch
+++ b/ctdb-ib.patch
@@ -19,9 +19,9 @@
  #include <system/network.h>
  #include <assert.h>
  #include "ctdb_private.h"
---- ctdb-2.2/Makefile.in.orig	2013-05-30 04:30:32.000000000 +0200
-+++ ctdb-2.2/Makefile.in	2013-06-07 20:27:01.381037615 +0200
-@@ -285,7 +285,7 @@
+--- ctdb-2.3/Makefile.in.orig	2013-07-11 07:18:06.000000000 +0200
++++ ctdb-2.3/Makefile.in	2013-07-13 22:20:14.932379870 +0200
+@@ -293,7 +293,7 @@
  CTDB_TEST_C = $(CTDB_CLIENT_OBJ:.o=.c) tools/ctdb.c tools/ctdb_vacuum.c  tests/src/ctdb_test.c
  
  CTDB_TEST_OBJ =  $(TALLOC_OBJ) $(TDB_OBJ) \
@@ -30,15 +30,15 @@
  
  tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
  
-@@ -305,9 +305,9 @@
+@@ -313,9 +313,9 @@
  	@echo Linking $@
- 	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
+ 	$(WRAPPER) $(CC) $(CFLAGS) -o $@ tests/src/ctdb_tool_stubby.o $(CTDB_TEST_OBJ) $(POPT_OBJ) $(LIB_FLAGS)
  
 -tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o
 +tests/bin/ibwrapper_test: $(CTDB_CLIENT_OBJ) ib/ibwrapper_test.o @INFINIBAND_WRAPPER_OBJ@
  	@echo Linking $@
--	@$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
-+	@$(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) @INFINIBAND_WRAPPER_OBJ@ $(LIB_FLAGS)
+-	$(WRAPPER) $(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
++	$(WRAPPER) $(CC) $(CFLAGS) -o $@ ib/ibwrapper_test.o $(CTDB_CLIENT_OBJ) @INFINIBAND_WRAPPER_OBJ@ $(LIB_FLAGS)
  
  manpages:
  	$(MAKE) -C doc
diff --git a/ctdb.spec b/ctdb.spec
index ea51daa..7b91eb9 100644
--- a/ctdb.spec
+++ b/ctdb.spec
@@ -15,12 +15,12 @@
 Summary:	A Clustered Database based on Samba's Trivial Database (TDB)
 Summary(pl.UTF-8):	Klastrowa baza danych oparta na bazie danych Trivial Database z Samby (TDB)
 Name:		ctdb
-Version:	2.2
+Version:	2.3
 Release:	1
 License:	GPL v3+
 Group:		Daemons
 Source0:	http://www.samba.org/ftp/ctdb/%{name}-%{version}.tar.gz
-# Source0-md5:	c5aa3c887d1cb1eb2cfd84bb22c3d142
+# Source0-md5:	5dfb5b055298b6cb80e7d0cd40768e50
 Patch0:		%{name}-ib.patch
 Patch1:		%{name}-format.patch
 URL:		http://ctdb.samba.org/
@@ -144,6 +144,7 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/ctdb
 %attr(440,root,root) /etc/sudoers.d/ctdb
 %attr(755,root,root) %{_sbindir}/ctdbd
+%attr(755,root,root) %{_sbindir}/ctdbd_wrapper
 %attr(755,root,root) %{_bindir}/ctdb
 %attr(755,root,root) %{_bindir}/ctdb_diagnostics
 %attr(755,root,root) %{_bindir}/ctdb_lock_helper