[rpms/icemon] rawhide: Updated to 3.4

[Jan Kratochvil <jan@jankratochvil.net>]

A new commit has been pushed.

Repo   : rpms/icemon
Branch : rawhide
Commit : deea8fd881ab4c2dbcbc0c4e445b7fe459c3ab53
Author : Jan Kratochvil <jan@jankratochvil.net>
Date   : 2026-08-08T23:18:05+02:00
Stats  : +7/-391 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/icemon/c/deea8fd881ab4c2dbcbc0c4e445b7fe459c3ab53?branch=rawhide

Log:
Updated to 3.4

---
diff --git a/.gitignore b/.gitignore
index 9058c4e..1565aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/icemon-3.3.tar.gz
+/icemon-3.4.tar.gz

diff --git a/cmake-version.patch b/cmake-version.patch
deleted file mode 100644
index 5331a44..0000000
--- a/cmake-version.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-commit b07bf3eb0c28ac5cd527d3ab675d2273d1866b48
-Author: Sergio Martins <sergio.martins@kdab.com>
-Date:   Mon Apr 28 03:39:49 2025 +0100
-
-    Fix build with CMake 4.0
-    
-    Newer CMake doesn't support such old minimum version
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6be47d3..e149f84 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.1.0)
-+cmake_minimum_required(VERSION 3.10.0)
- project(icemon VERSION 3.3)
- 
- find_package(ECM REQUIRED NO_MODULE)

diff --git a/icemon-asciidoc.patch b/icemon-asciidoc.patch
deleted file mode 100644
index 17a5a0c..0000000
--- a/icemon-asciidoc.patch
+++ /dev/null
@@ -1,364 +0,0 @@
-commit 479490ffbe0d13ed3059b67241671cb78521a10a
-Author: Luboš Luňák <l.lunak@centrum.cz>
-Date:   Tue Jul 28 16:34:03 2020 +0200
-
-    use asciidoc for manpages, instead of docbook
-    
-    This is the same like the matching Icecream commit.
-
-diff --git a/.travis.yml b/.travis.yml
-index 97d71bb..838d0bf 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -21,9 +21,11 @@ before_script:
- 
- - mkdir build
- - cd build
--- PKG_CONFIG_PATH=../icecream/lib/pkgconfig cmake ..
-+- PKG_CONFIG_PATH=../icecream/lib/pkgconfig cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/_inst
- 
--script: make
-+script:
-+- make
-+- make install
- 
- addons:
-   apt:
-@@ -31,6 +33,8 @@ addons:
-     - cmake
-     - qtbase5-dev
-     - extra-cmake-modules
-+    - asciidoc
-+    - xsltproc # for asciidoc
-     # for icecream
-     - libcap-ng-dev
-     - liblzo2-dev
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 10c2b82..6be47d3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,28 +37,6 @@ set_package_properties(Icecream PROPERTIES
-   URL "http://en.opensuse.org/Icecream"
-   TYPE REQUIRED
- )
--find_package(Docbook2X)
--set_package_properties(Docbook2X PROPERTIES
--  DESCRIPTION "docbook2X converts DocBook documents into the traditional Unix man page format"
--  PURPOSE "Required for man-page generation"
--  URL "http://docbook2x.sourceforge.net/"
--)
--
--# add a target to generate API documentation with Doxygen
--find_package(Doxygen)
--set_package_properties(Doxygen PROPERTIES
--  TYPE OPTIONAL
--  DESCRIPTION "Doxygen documentation generator"
--  PURPOSE "Needed for generating API documentation (make doc)"
--)
--if(DOXYGEN_FOUND)
--  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
--  add_custom_target(doc
--    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
--    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--    COMMENT "Generating API documentation with Doxygen" VERBATIM
--  )
--endif()
- 
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-diff --git a/cmake/modules/FindDocbook2X.cmake b/cmake/modules/FindDocbook2X.cmake
-deleted file mode 100644
-index 81d9f7a..0000000
---- a/cmake/modules/FindDocbook2X.cmake
-+++ /dev/null
-@@ -1,97 +0,0 @@
--# Attempt to find docbook-to-man binary from docbook2x package
--#
--# This module defines:
--# - DOCBOOK_TO_MAN_EXECUTABLE, path to docbook2x-man binary
--#
--# Note that the binary docbook-to-man in debian systems is a different application
--# than in other distributions.
--#
--# Debian systems
--# * docbook-to-man comes from the package docbook-to-man
--# * docbook2man comes from the package docbook-utils
--# * docbook2x-man comes from the package docbook2x
--# Suse
--# * docbook-to-man comes from the package docbook2x
--# * docbook2man comes from the package docbook-utils-minimal
--# ArchLinux
--# * docbook-to-man comes from the package docbook-to-man
--# * docbook2man comes from the package docbook2x
--#
--# We actually want the binary from docbook2x, which supports XML
--
--#=============================================================================
--# Copyright 2013 Kevin Funk <kfunk@kde.org>
--# Copyright 2015 Alex Merry <alexmerry@kde.org>
--#
--# Distributed under the OSI-approved BSD License (the "License");
--# see accompanying file Copyright.txt for details.
--#
--# This software is distributed WITHOUT ANY WARRANTY; without even the
--# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--# See the License for more information.
--#=============================================================================
--
--macro(_check_docbook2x_executable)
--    if (DOCBOOK_TO_MAN_EXECUTABLE)
--        execute_process(
--            COMMAND ${DOCBOOK_TO_MAN_EXECUTABLE} --version
--            OUTPUT_VARIABLE _output
--            ERROR_QUIET
--        )
--        if("${_output}" MATCHES "docbook2X ([0-9]+\\.[0-9]+\\.[0-9]+)")
--            set(DOCBOOK_TO_MAN_EXECUTABLE ${_docbook_to_man_executable})
--            set(Docbook2X_VERSION ${CMAKE_MATCH_1})
--        else()
--            unset(DOCBOOK_TO_MAN_EXECUTABLE)
--            unset(DOCBOOK_TO_MAN_EXECUTABLE CACHE)
--        endif()
--    endif()
--endmacro()
--
--if (DOCBOOK_TO_MAN_EXECUTABLE)
--    _check_docbook2x_executable()
--else()
--    foreach(test_exec docbook2x-man docbook-to-man db2x_docbook2man docbook2man)
--        find_program(DOCBOOK_TO_MAN_EXECUTABLE
--            NAMES ${test_exec}
--        )
--        _check_docbook2x_executable()
--        if (DOCBOOK_TO_MAN_EXECUTABLE)
--            break()
--        endif()
--    endforeach()
--endif()
--
--include(FindPackageHandleStandardArgs)
--
--find_package_handle_standard_args(Docbook2X
--# TODO: Use FOUND_VAR when requiring CMake 2.8.11
--#    FOUND_VAR Docbook2X_FOUND
--    REQUIRED_VARS DOCBOOK_TO_MAN_EXECUTABLE
--    VERSION_VAR Docbook2X_VERSION
--)
--set(Docbook2X_FOUND DOCBOOK2X_FOUND)
--
--if (Docbook2X_FOUND)
--    macro(install_docbook_man_page name section)
--        set(inputfn "man-${name}.${section}.xml")
--        set(input "${CMAKE_CURRENT_SOURCE_DIR}/${inputfn}")
--        set(outputfn "${name}.${section}")
--        set(output "${CMAKE_CURRENT_BINARY_DIR}/${outputfn}")
--        set(target "manpage-${outputfn}")
--
--        add_custom_command(
--            OUTPUT ${output}
--            COMMAND ${DOCBOOK_TO_MAN_EXECUTABLE} ${input}
--            DEPENDS ${input}
--            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
--        )
--        add_custom_target(${target} ALL
--            DEPENDS "${output}"
--        )
--        install(
--            FILES ${output}
--            DESTINATION ${CMAKE_INSTALL_MANDIR}/man${section}
--        )
--    endmacro()
--endif()
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 4e83c15..8138dfe 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1,6 +1,27 @@
- # It's not possible to install the docbook right now (Qt-only project)
- #add_subdirectory(icemon)
- 
--if(DOCBOOK_TO_MAN_EXECUTABLE)
--  install_docbook_man_page(icemon 1)
-+find_program(ASCIIDOC asciidoc)
-+find_program(A2X a2x)
-+
-+if(NOT ASCIIDOC OR NOT A2X)
-+    message(WARNING "Could not find asciidoc or a2x, manual page will not be generated.")
-+else()
-+    add_custom_target(manpage ALL)
-+    add_custom_command(
-+        TARGET manpage
-+        COMMAND ${ASCIIDOC} -a revnumber=${PROJECT_VERSION} -d manpage -b docbook
-+            -o ${CMAKE_CURRENT_BINARY_DIR}/icemon.xml ${CMAKE_CURRENT_SOURCE_DIR}/icemon.adoc
-+        MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/icemon.adoc
-+        BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/icemon.xml)
-+    add_custom_command(
-+        TARGET manpage
-+        COMMAND ${A2X} --doctype manpage --format manpage
-+             ${CMAKE_CURRENT_BINARY_DIR}/icemon.xml
-+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-+        MAIN_DEPENDENCY ${CMAKE_CURRENT_BINARY_DIR}/icemon.xml
-+        BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/icemon.1)
-+    install(
-+        FILES ${CMAKE_CURRENT_BINARY_DIR}/icemon.1
-+        DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
- endif()
-diff --git a/doc/icemon.adoc b/doc/icemon.adoc
-new file mode 100644
-index 0000000..7a23389
---- /dev/null
-+++ b/doc/icemon.adoc
-@@ -0,0 +1,54 @@
-+ICEMON(1)
-+=========
-+:doctype: manpage
-+:man source: icemon
-+:man version: {revnumber}
-+:man manual: Icemon User's Manual
-+
-+
-+Name
-+----
-+icemon - Icecream network monitor
-+
-+
-+Synopsis
-+--------
-+*icemon* _OPTION_
-+
-+
-+Description
-+-----------
-+Icemon is a graphical application to view an Icecream compile network and monitor its traffic.
-+
-+
-+
-+Options
-+-------
-+
-+*-h, --help*::
-+    Print help message and exit.
-+
-+*-n, --netname* _net-name_::
-+    The name of the Icecream network `icemon` should connect to.
-+
-+*-s, --scheduler* _host-name_::
-+    The hostname of the Icecream scheduler `icemon` should connect to.
-+
-+
-+
-+See Also
-+--------
-+ifdef::env-github[]
-+link:https://github.com/icecc/icecream/tree/master/doc/icecream.adoc[icecream(7)]
-+link:https://github.com/icecc/icecream/tree/master/doc/icecc-scheduler.adoc[icecc-scheduler(1)]
-+link:https://github.com/icecc/icecream/tree/master/doc/iceccd.adoc[iceccd(1)]
-+endif::[]
-+
-+ifndef::env-github[]
-+icecream(7), icecc-scheduler(1), iceccd(1)
-+endif::[]
-+
-+
-+Website
-+-------
-+Project home: https://github.com/icecc/icemon
-diff --git a/doc/man-icemon.1.xml b/doc/man-icemon.1.xml
-deleted file mode 100644
-index 66cb6d8..0000000
---- a/doc/man-icemon.1.xml
-+++ /dev/null
-@@ -1,93 +0,0 @@
--<?xml version="1.0" ?>
--<!-- vim:set ts=4 noet syntax=xml: -->
--<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
--[
--  <!ENTITY icemon "<application>icemon</application>">
--]>
--
--<refentry id="icemon">
--
--<refentryinfo>
--  <title>Icecream User's Manual</title>
--  <author>
--    <personname>
--      <firstname>Pino</firstname>
--      <surname>Toscano</surname>
--    </personname>
--  </author>
--  <date>June 12th, 2013</date>
--  <productname>Icecream</productname>
--</refentryinfo>
--
--<refmeta>
--  <refentrytitle>icemon</refentrytitle>
--  <manvolnum>1</manvolnum>
--</refmeta>
--
--<refnamediv>
--  <refname>icemon</refname>
--  <refpurpose>Icecream network monitor</refpurpose>
--</refnamediv>
--
--<refsynopsisdiv>
--<cmdsynopsis>
--<command>icemon</command>
--<arg><replaceable>OPTION</replaceable></arg>
--</cmdsynopsis>
--</refsynopsisdiv>
--
--<refsect1>
--<title>Description</title>
--<para>&icemon; is a graphical application to view an Icecream compile
--network and monitor its traffic.</para>
--</refsect1>
--
--<refsect1>
--<title>Options</title>
--
--<variablelist>
--
--<varlistentry>
--<term><option>-h</option>, <option>--help</option></term>
--<listitem><para>Print help message and exit.</para></listitem>
--</varlistentry>
--
--<varlistentry>
--<term><option>-n</option>, <option>--netname</option>
--<parameter>net-name</parameter></term>
--<listitem><para>The name of the Icecream network &icemon; should connect to.
--</para></listitem>
--</varlistentry>
--
--
--<varlistentry>
--<term><option>-s</option>, <option>--scheduler</option>
--<parameter>host-name</parameter></term>
--<listitem><para>The hostname of the Icecream scheduler &icemon; should connect to.
--</para></listitem>
--</varlistentry>
--
--</variablelist>
--
--</refsect1>
--
--
--<refsect1>
--<title>See Also</title>
--<para>icecream(7), icecc-scheduler(1), iceccd(1)</para>
--</refsect1>
--
--<refsect1>
--<title>Maintainers</title>
--<simplelist>
--<member>Daniel Molkentin &lt;molkentin@kde.org&gt;</member>
--<member>Kevin Funk &lt;kfunk@kde.org&gt;</member>
--</simplelist>
--</refsect1>
--
--<refsect1>
--<title>Website</title>
--<para>Project home: https://github.com/icecc/icemon</para>
--</refsect1>
--
--</refentry>

diff --git a/icemon.spec b/icemon.spec
index cc5b2c1..4a509ab 100644
--- a/icemon.spec
+++ b/icemon.spec
@@ -1,6 +1,6 @@
 Name:           icemon
-Version:        3.3
-Release:        20%{?dist}
+Version:        3.4
+Release:        1%{?dist}
 Summary:        Icecream GUI monitor
 
 # Automatically converted from old format: GPLv2+ - review is highly recommended.
@@ -8,10 +8,6 @@ License:        GPL-2.0-or-later
 URL:            https://kfunk.org/tag/icemon/
 Source0:        https://github.com/icecc/icemon/archive/v%{version}/%{name}-%{version}.tar.gz
 Source1:        icemon.metainfo.xml
-# Backport of docbook -> asciidoc from upstream
-# https://github.com/icecc/icemon/commit/479490ffbe0d13ed3059b67241671cb78521a10a
-Patch1:         icemon-asciidoc.patch
-Patch2:         cmake-version.patch
 
 BuildRequires:    gcc-c++
 BuildRequires:    pkgconfig(icecc) >= 1.3
@@ -19,7 +15,6 @@ BuildRequires:    cmake
 BuildRequires:    desktop-file-utils
 BuildRequires:    extra-cmake-modules
 BuildRequires:    qt5-qtbase-devel
-BuildRequires:    asciidoc
 BuildRequires:    libappstream-glib
 
 Requires:    hicolor-icon-theme
@@ -55,6 +50,9 @@ install -m644 -D %{SOURCE1} %{buildroot}/%{_metainfodir}/%{name}.metainfo.xml
 %doc CHANGELOG.md README.md
 
 %changelog
+* Sat Aug  8 2026 Jan Kratochvil <jan@jankratochvil.net> - 3.4-1
+- Updated to 3.4
+
 * Sun Jul 26 2026 Jan Kratochvil <jan@jankratochvil.net> - 3.3-20
 - Fix rhbz#2504133 - icemon: FTBFS in Fedora rawhide/f45
 

diff --git a/sources b/sources
index a1e8427..7df8ac7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (icemon-3.3.tar.gz) = b627086811e13aa7b809a03615c247b320af87cb4c57953dcc2201d4cc39de5d4a06864f1c2e3ab8b89358d8ffc8725c675ad43bec99d2bc7cbc563fbbf07768
+SHA512 (icemon-3.4.tar.gz) = 82621764d0a3ea8c9f21a162f017f24ef24d3d5aac645515e488f307a0697000a48dccc579bf8d9fc6c5f1592fd85628f2ab7b497028a95aeed1b3985b98da0b