commit 7f6e7f779d6d4d428a67e882d9750c4d85be806f
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 2 09:49:38 2014 +0100
- updated to 2.5.4
- removed obsolete ib patch
ctdb-ib.patch | 44 --------------------------------------------
ctdb.spec | 9 ++++-----
2 files changed, 4 insertions(+), 49 deletions(-)
---
diff --git a/ctdb.spec b/ctdb.spec
index 84fbc83..b6ba202 100644
--- a/ctdb.spec
+++ b/ctdb.spec
@@ -14,14 +14,13 @@
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.5.3
+Version: 2.5.4
Release: 1
License: GPL v3+
Group: Daemons
Source0: http://www.samba.org/ftp/ctdb/%{name}-%{version}.tar.gz
-# Source0-md5: df71f8a815a48d2649a0895565988d3b
-Patch0: %{name}-ib.patch
-Patch1: %{name}-format.patch
+# Source0-md5: c73fceb69f192d629150b84b10567497
+Patch0: %{name}-format.patch
URL: http://ctdb.samba.org/
%{?with_pcp:BuildRequires: pcp-devel}
BuildRequires: popt-devel
@@ -84,7 +83,6 @@ wyeksportowania do PMCD.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%configure \
@@ -169,6 +167,7 @@ fi
%{_mandir}/man1/ping_pong.1*
%{_mandir}/man5/ctdbd.conf.5*
%{_mandir}/man7/ctdb.7*
+%{_mandir}/man7/ctdb-statistics.7*
%{_mandir}/man7/ctdb-tunables.7*
%files devel
diff --git a/ctdb-ib.patch b/ctdb-ib.patch
deleted file mode 100644
index c8271cf..0000000
--- a/ctdb-ib.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- ctdb-2.0/ib/ibwrapper.c.orig 2012-10-31 02:33:25.000000000 +0100
-+++ ctdb-2.0/ib/ibwrapper.c 2012-12-16 16:56:36.987433136 +0100
-@@ -34,7 +34,7 @@
- #include <unistd.h>
-
- #include "includes.h"
--#include "lib/events/events.h"
-+#include "tevent.h"
- #include "ibwrapper.h"
-
- #include <infiniband/kern-abi.h>
---- ctdb-2.0/ib/ibw_ctdb_init.c.orig 2012-10-31 02:33:25.000000000 +0100
-+++ ctdb-2.0/ib/ibw_ctdb_init.c 2012-12-16 17:00:33.467428207 +0100
-@@ -21,6 +21,7 @@
- */
-
- #include "includes.h"
-+#include "lib/util/dlinklist.h"
- #include <system/network.h>
- #include <assert.h>
- #include "ctdb_private.h"
---- 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) \
-- @CTDB_SYSTEM_OBJ@ $(REPLACE_OBJ) $(EXTRA_OBJ) $(TEVENT_OBJ)
$(SOCKET_WRAPPER_OBJ)
-+ @CTDB_SYSTEM_OBJ@ $(REPLACE_OBJ) $(EXTRA_OBJ) $(TEVENT_OBJ)
$(SOCKET_WRAPPER_OBJ) @INFINIBAND_WRAPPER_OBJ@
-
- tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c
$(CTDBD_TEST_C)
-
-@@ -313,9 +313,9 @@
- @echo Linking $@
- $(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 $@
-- $(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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ctdb.git/commitdiff/7f6e7f779d6d4d428a67e882d9750c4d85be806f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
