Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2018-04-30 22:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "booth" Mon Apr 30 22:58:33 2018 rev:45 rq:602541 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2018-02-27 16:57:09.753766188 +0100 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2018-04-30 22:59:37.358963662 +0200 @@ -1,0 +2,8 @@ +Mon Apr 30 06:52:34 UTC 2018 - [email protected] + +- Doc: fix the documentation build with asciidoctor (bsc#1075764): + * fix_asciidoc_build.patch +- Service: restart arbitrator on failure +- Upstream version cs: c2389e3020e8a3780b679cf0c9857bd608e99fa1 + +------------------------------------------------------------------- Old: ---- booth-1.0+20180201.80199f9.tar.bz2 New: ---- booth-1.0+20180417.c2389e3.tar.bz2 fix_asciidoc_build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.UtVJB1/_old 2018-04-30 22:59:37.990940601 +0200 +++ /var/tmp/diff_new_pack.UtVJB1/_new 2018-04-30 22:59:37.994940455 +0200 @@ -21,7 +21,7 @@ %bcond_with glue # local commit: -%global commit 1.0+20180201.80199f9 +%global commit 1.0+20180417.c2389e3 %global uname hacluster %global gname haclient @@ -40,6 +40,7 @@ Url: https://github.com/ClusterLabs/booth Source: %{name}-%{commit}.tar.bz2 Source1: %{name}-rpmlintrc +Patch1: fix_asciidoc_build.patch BuildRequires: asciidoc BuildRequires: autoconf BuildRequires: automake @@ -78,6 +79,7 @@ %prep %setup -q -n %{name}-%{commit} +%patch1 -p1 %build autoreconf -fvi ++++++ booth-1.0+20180201.80199f9.tar.bz2 -> booth-1.0+20180417.c2389e3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20180201.80199f9/.git_info new/booth-1.0+20180417.c2389e3/.git_info --- old/booth-1.0+20180201.80199f9/.git_info 2018-02-22 10:01:37.572481757 +0100 +++ new/booth-1.0+20180417.c2389e3/.git_info 2018-04-30 08:41:55.389581125 +0200 @@ -1 +1 @@ -v1.0-133-g80199f9 +v1.0-139-gc2389e3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20180201.80199f9/booth.spec new/booth-1.0+20180417.c2389e3/booth.spec --- old/booth-1.0+20180201.80199f9/booth.spec 2018-02-01 10:57:55.000000000 +0100 +++ new/booth-1.0+20180417.c2389e3/booth.spec 2018-04-17 12:21:32.000000000 +0200 @@ -45,7 +45,7 @@ Source: booth.tar.bz2 Source1: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: asciidoc +BuildRequires: asciidoctor BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20180201.80199f9/conf/booth-arbitrator.service.in new/booth-1.0+20180417.c2389e3/conf/booth-arbitrator.service.in --- old/booth-1.0+20180201.80199f9/conf/booth-arbitrator.service.in 2018-02-01 10:57:55.000000000 +0100 +++ new/booth-1.0+20180417.c2389e3/conf/booth-arbitrator.service.in 2018-04-17 12:21:32.000000000 +0200 @@ -14,3 +14,6 @@ Type=simple @NOTIFY_ACCESS_SWITCH@NotifyAccess=main ExecStart=/usr/sbin/boothd daemon -S -c /etc/booth/booth.conf + +# Restart options include: no, on-success, on-failure, on-abnormal, on-watchdog, on-abort, or always +Restart=on-failure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20180201.80199f9/configure.ac new/booth-1.0+20180417.c2389e3/configure.ac --- old/booth-1.0+20180201.80199f9/configure.ac 2018-02-01 10:57:55.000000000 +0100 +++ new/booth-1.0+20180417.c2389e3/configure.ac 2018-04-17 12:21:32.000000000 +0200 @@ -61,11 +61,15 @@ AC_PATH_PROGS(PKGCONFIG, pkg-config) AC_PATH_PROGS(ASCIIDOC, asciidoc) +AC_PATH_PROGS(ASCIIDOCTOR, asciidoctor) +AC_PATH_PROGS(A2X, a2x) AC_PATH_PROGS(XML2CONFIG, xml2-config) -AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${ASCIIDOC}" != x"") +AM_CONDITIONAL(IS_ASCIIDOC, test "x{ASCIIDOC}" = "xasciidoc") +AM_CONDITIONAL(IS_A2X, test "x${A2X}" = "xa2x") +AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${A2X}" != x"" || test x"${ASCIIDOCTOR}" != x"") AM_CONDITIONAL(BUILD_ASCIIDOC_HTML_MAN, - test "x${ASCIIDOC}" != "x" && test "x$with_html_man" = "xyes") + (test "x${ASCIIDOC}" != "x" || test x"${ASCIIDOCTOR}" != x"") && test "x$with_html_man" = "xyes") # libgcrypt or mhash for hmac libgcrypt_installed="yes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20180201.80199f9/docs/Makefile.am new/booth-1.0+20180417.c2389e3/docs/Makefile.am --- old/booth-1.0+20180201.80199f9/docs/Makefile.am 2018-02-01 10:57:55.000000000 +0100 +++ new/booth-1.0+20180417.c2389e3/docs/Makefile.am 2018-04-17 12:21:32.000000000 +0200 @@ -24,6 +24,8 @@ generated_docs = generated_mans = +HTML_GENERATOR = +MANPAGE_GENERATOR = if BUILD_ASCIIDOC_HTML_MAN generated_docs += $(ascii:%.txt=%.html) $(asciiman:%.txt=%.html) @@ -34,9 +36,21 @@ man8_MANS = $(generated_mans) endif +if IS_ASCIIDOC +HTML_GENERATOR += $(ASCIIDOC)--unsafe --backend=xhtml11 +else +HTML_GENERATOR += $(ASCIIDOCTOR)-b xhtml5 +endif + +if IS_A2X +MANPAGE_GENERATOR += $(A2X) -f manpage +else +MANPAGE_GENERATOR += $(ASCIIDOCTOR) -b manpage +endif + %.html: %.txt - $(ASCIIDOC) --unsafe --backend=xhtml11 $< + $(HTML_GENERATOR) $< %.8: %.8.txt - a2x -f manpage $< + $(MANPAGE_GENERATOR) $< clean-local: -rm -rf $(generated_docs) $(generated_mans) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth-1.0+20180201.80199f9/docs/boothd.8.txt new/booth-1.0+20180417.c2389e3/docs/boothd.8.txt --- old/booth-1.0+20180201.80199f9/docs/boothd.8.txt 2018-02-01 10:57:55.000000000 +0100 +++ new/booth-1.0+20180417.c2389e3/docs/boothd.8.txt 2018-04-17 12:21:32.000000000 +0200 @@ -1,5 +1,5 @@ BOOTHD(8) -=========== +========= :doctype: manpage ++++++ fix_asciidoc_build.patch ++++++ diff --git a/configure.ac b/configure.ac index 56df5bd..3bf41b3 100644 --- a/configure.ac +++ b/configure.ac @@ -65,8 +65,8 @@ AC_PATH_PROGS(ASCIIDOCTOR, asciidoctor) AC_PATH_PROGS(A2X, a2x) AC_PATH_PROGS(XML2CONFIG, xml2-config) -AM_CONDITIONAL(IS_ASCIIDOC, test "x{ASCIIDOC}" = "xasciidoc") -AM_CONDITIONAL(IS_A2X, test "x${A2X}" = "xa2x") +AM_CONDITIONAL(IS_ASCIIDOC, test x"${ASCIIDOC}" != x"") +AM_CONDITIONAL(IS_A2X, test x"${A2X}" != x"") AM_CONDITIONAL(BUILD_ASCIIDOC, test x"${A2X}" != x"" || test x"${ASCIIDOCTOR}" != x"") AM_CONDITIONAL(BUILD_ASCIIDOC_HTML_MAN, (test "x${ASCIIDOC}" != "x" || test x"${ASCIIDOCTOR}" != x"") && test "x$with_html_man" = "xyes")
