SOURCES/scap-workbench-1.2.1-use_asciidoc-PR_200.patch

@@ -0,0 +1,94 @@
+From 03391003a5b6f63988b0687625d85c0060b1a932 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
+Date: Wed, 25 Jul 2018 18:59:04 +0200
+Subject: [PATCH 1/2] Replace SVG logo by PNG logo in Manual
+
+---
+ doc/user_manual.adoc     |   2 +-
+ doc/user_manual/logo.png | Bin 0 -> 17058 bytes
+ doc/user_manual/logo.svg |  75 ---------------------------------------
+ scap-workbench.wxs.in    |   6 ++--
+ 4 files changed, 4 insertions(+), 79 deletions(-)
+ create mode 100644 doc/user_manual/logo.png
+ delete mode 100644 doc/user_manual/logo.svg
+
+From bd356e0a8dbab798db96b0d009758e8f56e3cf11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
+Date: Wed, 25 Jul 2018 19:06:27 +0200
+Subject: [PATCH 2/2] Replace asciidoctor by asciidoc
+
+Asciidoc is present in many Linux Distributions.
+This makes SCAP Workbench also consistent with OpenSCAP.
+---
+ .travis.yml    |  2 +-
+ CMakeLists.txt | 16 ++++++++--------
+ README.md      |  2 +-
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/.travis.yml b/.travis.yml
+index f928331c..809bfd19 100644
+--- a/.travis.yml
++++ b/.travis.yml
+@@ -11,7 +11,7 @@ before_install:
+   - brew update
+   - brew install jq
+   - brew install cartr/qt4/qt@4
+-  - brew install asciidoctor
++  - brew install asciidoc
+ 
+ before_script:
+   - git clone --depth 1 https://github.com/openscap/openscap.git -b master
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 993b949f..b4427f1f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,15 +89,15 @@ if (SCAP_AS_RPM_EXECUTABLE)
+ endif()
+ 
+ # This is optional, only required if user wants documentation rebuilt
+-find_program(ASCIIDOCTOR_EXECUTABLE NAMES asciidoctor)
+-option(SCAP_WORKBENCH_REBUILD_MANUAL "If enabled, user manual will be rebuilt (requires asciidoctor to be installed)" TRUE)
++find_program(ASCIIDOC_EXECUTABLE NAMES asciidoc)
++option(SCAP_WORKBENCH_REBUILD_MANUAL "If enabled, user manual will be rebuilt (requires asciidoc to be installed)" TRUE)
+ option(SCAP_WORKBENCH_USE_NATIVE_FILE_DIALOGS "If enabled, native desktop environment file dialogs are used (disable if you have crashes at startup)" TRUE)
+-if (SCAP_WORKBENCH_REBUILD_MANUAL AND NOT ASCIIDOCTOR_EXECUTABLE)
+-    message("asciidoctor has not been found, user manual won't be rebuilt even though SCAP_WORKBENCH_REBUILD_MANUAL has been enabled.")
++if (SCAP_WORKBENCH_REBUILD_MANUAL AND NOT ASCIIDOC_EXECUTABLE)
++    message("asciidoc has not been found, user manual won't be rebuilt even though SCAP_WORKBENCH_REBUILD_MANUAL has been enabled.")
+ endif()
+ if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual.html")
+-    if (NOT ASCIIDOCTOR_EXECUTABLE)
+-        message(FATAL_ERROR "You seem to be using scap-workbench from the repository ('${CMAKE_SOURCE_DIR}/doc/user_manual.html' hasn't been found). Please install asciidoctor to build the manual! You can use `gem install asciidoctor` if asciidoctor is not in your distribution package repository. If you don't have access to asciidoctor and don't mind not having a manual, run `touch ${CMAKE_SOURCE_DIR}/doc/user_manual.html` and rerun cmake.")
++    if (NOT ASCIIDOC_EXECUTABLE)
++        message(FATAL_ERROR "You seem to be using scap-workbench from the repository ('${CMAKE_SOURCE_DIR}/doc/user_manual.html' hasn't been found). Please install asciidoc to build the manual! If you don't have access to asciidoc and don't mind not having a manual, run `touch ${CMAKE_SOURCE_DIR}/doc/user_manual.html` and rerun cmake.")
+     endif()
+     set(SCAP_WORKBENCH_REBUILD_MANUAL TRUE)
+ endif()
+@@ -269,12 +269,12 @@ install(FILES "share/pixmaps/scap-workbench.svg"
+ install(FILES "scap-workbench.appdata.xml"
+     DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata")
+ 
+-if (ASCIIDOCTOR_EXECUTABLE)
++if (ASCIIDOC_EXECUTABLE)
+     file(GLOB USER_MANUAL_SCREENSHOTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual/*.png")
+     add_custom_command(
+         OUTPUT doc/user_manual.html
+         COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/doc
+-        COMMAND ${ASCIIDOCTOR_EXECUTABLE} --destination-dir ${CMAKE_CURRENT_BINARY_DIR}/doc -b html5 -a data-uri user_manual.adoc
++        COMMAND ${ASCIIDOC_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/doc/user_manual.html -b html5 -a data-uri user_manual.adoc
+         COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/doc/user_manual.html ${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual.html
+         DEPENDS doc/user_manual.adoc ${USER_MANUAL_SCREENSHOTS}
+         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc
+diff --git a/README.md b/README.md
+index 934c8240..8cf7ec93 100644
+--- a/README.md
++++ b/README.md
+@@ -24,7 +24,7 @@ required dependencies:
+ 
+ required dependencies (only for the git repo, not required for released tarballs):
+ ```console
+-# yum install rubygem-asciidoctor
++# yum install asciidoc
+ ```
+ 
+ optional dependencies:

SPECS/scap-workbench.spec

@@ -2,7 +2,7 @@
 
 Name:       scap-workbench
 Version:    1.2.0
-Release:    6%{?dist}
+Release:    8%{?dist}
 Summary:    Scanning, tailoring, editing and validation tool for SCAP content
 
 License:    GPLv3+
@@ -15,6 +15,7 @@ Patch4:     scap-workbench-1.2.2-generate-result-based-remediation-from-tailored
 Patch5:     scap-workbench-1.2.2-ui_dimensions.patch
 Patch6:     scap-workbench-1.2.2-refactor_messages-PR_271.patch
 Patch7:     scap-workbench-1.2.2-remote_sudo-PR_270.patch
+Patch8:     scap-workbench-1.2.1-use_asciidoc-PR_200.patch
 Group:      System Environment/Base
 
 BuildRequires:  cmake >= 2.6
@@ -23,6 +24,8 @@ BuildRequires:  qt5-devel >= 5.0.0
 BuildRequires:  openscap-devel >= 1.2.11
 BuildRequires:  openscap-utils >= 1.2.11
 Requires:       openscap-utils >= 1.2.11
+# Enables rebuild of documentation from downstream patches
+BuildRequires:  asciidoc
 # ssh to scan remote machines
 BuildRequires:  openssh-clients
 Requires:       openssh-clients
@@ -50,6 +53,7 @@ content. The tool is based on OpenSCAP library.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %build
 %cmake -D CMAKE_INSTALL_DOCDIR=%{_pkgdocdir} .
@@ -76,6 +80,12 @@ make install DESTDIR=%{buildroot}
 %doc %{_pkgdocdir}/README.md
 
 %changelog
+* Fri Feb 12 2021 Matej Tyc <matyc@redhat.com> - 1.2.0-8
+- Introduce asciidoc support instead of asciidoctor (RHBZ#1877522)
+
+* Tue Feb 09 2021 Matej Tyc <matyc@redhat.com> - 1.2.0-7
+- Enabled asciidoc support during build (RHBZ#1877522)
+
 * Mon Feb  1 14:38:24 CET 2021 Matej Tyc <matyc@redhat.com> - 1.2.0-6
 - Refactor handling of scanner messages.
 - Implement passwordless sudo support (RHBZ#1877522)