The branch, 2.5 has been updated via 8b3eaf904fabe2c41e97f0b644d4a7367d57c612 (commit) via 271b5e753ef5b4ac8b08faa1ad9e935b2f5d2d33 (commit) via b3c115733a41bba4dad34a703a0ce9b5422849c8 (commit) from d0f7f95f95f6bfcd9139b4d21feb08cb48366527 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5 - Log ----------------------------------------------------------------- commit 8b3eaf904fabe2c41e97f0b644d4a7367d57c612 Author: Michael Adam <ob...@samba.org> Date: Fri Dec 6 01:37:34 2013 +0100 packaging:RPM: don't run autogen. autogen is already run in maketarball.sh which generates the tarball for the RPM. This way, we don't have a rpm 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 <ob...@samba.org> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> Autobuild-User(master): Martin Schwenke <mart...@samba.org> Autobuild-Date(master): Mon Dec 9 05:47:00 CET 2013 on sn-devel-104 (Imported from commit c65ad56d40c2ac286dc9d726119d04384981d0b3) commit 271b5e753ef5b4ac8b08faa1ad9e935b2f5d2d33 Author: Michael Adam <ob...@samba.org> Date: Fri Dec 6 01:33:57 2013 +0100 packaging:RPM: package the new manpages Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> (Imported from commit 7dbb068aa7e77f34377e762bbd65cb7ca72b85b4) commit b3c115733a41bba4dad34a703a0ce9b5422849c8 Author: Michael Adam <ob...@samba.org> Date: Fri Dec 6 01:31:11 2013 +0100 build: install the new manpages Signed-off-by: Michael Adam <ob...@samba.org> Reviewed-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> (Imported from commit 0e8340229b0efa6291218a24865e52acb24bb12c) ----------------------------------------------------------------------- Summary of changes: Makefile.in | 6 ++++++ packaging/RPM/ctdb.spec.in | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/Makefile.in b/Makefile.in index 55b21b7..1038e71 100755 --- a/Makefile.in +++ b/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)/man5; 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 diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in index b7d1bef..e3a3486 100644 --- a/packaging/RPM/ctdb.spec.in +++ b/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 \ @@ -202,9 +199,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/ctdb.7.gz +%{_mandir}/man7/ctdb-tunables.7.gz %{_libdir}/pkgconfig/ctdb.pc -- CTDB repository