[PATCHES] ctdb build/packaging

[Michael Adam]

Attached find three patches to ctdb/ in master.
- install new manpages
- package new manpages
- don't run autogen ins spec

Comments/review/push appreciated.

Cheers - Michael
-------------- next part --------------
From e11a4f82c68df4f7d54171832791c40447f2415e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 6 Dec 2013 01:31:11 +0100
Subject: [PATCH 1/3] ctdb:build: install the new manpages

Signed-off-by: Michael Adam <obnox at samba.org>
---
 ctdb/Makefile.in |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index eb280f2..06fc99a 100755
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -370,9 +370,15 @@ install: all manpages $(PMDA_INSTALL)
 	if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
 	if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1 $(DESTDIR)$(mandir)/man1; fi
 	if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1 $(DESTDIR)$(mandir)/man1; fi
+	if [ -f doc/ctdbd_wrapper.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd_wrapper.1 $(DESTDIR)$(mandir)/man1; fi
 	if [ -f doc/onnode.1 ];then ${INSTALLCMD} -m 644 doc/onnode.1 $(DESTDIR)$(mandir)/man1; fi
 	if [ -f doc/ltdbtool.1 ]; then ${INSTALLCMD} -m 644 doc/ltdbtool.1 $(DESTDIR)$(mandir)/man1; fi
 	if [ -f doc/ping_pong.1 ];then ${INSTALLCMD} -m 644 doc/ping_pong.1 $(DESTDIR)$(mandir)/man1; fi
+	if [ -f doc/ctdb.7 ]; then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man7; fi
+	if [ -f doc/ctdb.7 ];then ${INSTALLCMD} -m 644 doc/ctdb.7 $(DESTDIR)$(mandir)/man7; fi
+	if [ -f doc/ctdb-tunables.7 ];then ${INSTALLCMD} -m 644 doc/ctdb-tunables.7 $(DESTDIR)$(mandir)/man7; fi
+	if [ -f doc/ctdbd.conf.5 ]; then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man5; fi
+	if [ -f doc/ctdbd.conf.5 ];then ${INSTALLCMD} -m 644 doc/ctdbd.conf.5 $(DESTDIR)$(mandir)/man7; fi
 	${INSTALLCMD} -m 755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb
 	${INSTALLCMD} -m 755 config/debug-hung-script.sh $(DESTDIR)$(etcdir)/ctdb
 	${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb
-- 
1.7.9.5


From 0895d33eca2a5315ae07d0376ca74025ab141fa3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 6 Dec 2013 01:33:57 +0100
Subject: [PATCH 2/3] ctdb:packaging:RPM: package the new manpages

Signed-off-by: Michael Adam <obnox at samba.org>
---
 ctdb/packaging/RPM/ctdb.spec.in |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index b7d1bef..93fff86 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -202,9 +202,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/onnode
 %{_mandir}/man1/ctdb.1.gz
 %{_mandir}/man1/ctdbd.1.gz
+%{_mandir}/man1/ctdbd_wrapper.1.gz
 %{_mandir}/man1/onnode.1.gz
 %{_mandir}/man1/ltdbtool.1.gz
 %{_mandir}/man1/ping_pong.1.gz
+%{_mandir}/man5/ctdbd.conf.5.gz
+%{_mandir}/man7/ctdbd.7.gz
+%{_mandir}/man7/ctdb-tunables.7.gz
 %{_libdir}/pkgconfig/ctdb.pc
 
 
-- 
1.7.9.5


From 856f57d8bb6d79c6ea35c58b686d0af0e25c760f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 6 Dec 2013 01:37:34 +0100
Subject: [PATCH 3/3] ctdb:packaging:RPM: don't run autogen.

This way, we don't have a build dependency on autoconf.
Recent changes introduced a dependency into autoconf
version >= 2.60, so this fix allows the generated
source RPM to be built also on older platforms.

Signed-off-by: Michael Adam <obnox at samba.org>
---
 ctdb/packaging/RPM/ctdb.spec.in |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 93fff86..e8f446f 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -83,9 +83,6 @@ fi
 
 export CC
 
-## always run autogen.sh
-./autogen.sh
-
 CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
 %if %with_included_talloc
 	--with-included-talloc \
-- 
1.7.9.5

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 215 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20131206/2ee9f654/attachment.pgp>