From 5c156640516bfce7bef1755c6e0b60432244673a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:27:27 +0000 Subject: [PATCH 01/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index 820785c..da4cded 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -112,6 +112,9 @@ make test %{_datadir}/Servus %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.5.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.5.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 50d2088cfeeee7e6e33fa28fde9b9d0815378199 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:39:35 +0000 Subject: [PATCH 02/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index da4cded..2732c30 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -112,6 +112,9 @@ make test %{_datadir}/Servus %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.5.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.5.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 39d8e1c81b6a843d89bf5394892144ce95b11ee5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:17:29 +0000 Subject: [PATCH 03/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index 2732c30..fb939ef 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -112,6 +112,9 @@ make test %{_datadir}/Servus %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.5.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.5.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 08dc8f14ffd22567c7fb6b0ecb1cccaf28bd613e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 7 Aug 2024 10:14:13 +0200 Subject: [PATCH 04/14] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- servus.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/servus.spec b/servus.spec index fb939ef..9e278d5 100644 --- a/servus.spec +++ b/servus.spec @@ -15,12 +15,13 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code # see ACKNOWLEDGEMENTS.txt for details -License: LGPLv3 and RSA +# Automatically converted from old format: LGPLv3 and RSA - review is highly recommended. +License: LGPL-3.0-only AND LicenseRef-RSA URL: https://github.com/HBPVIS/Servus Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz # https://github.com/HBPVIS/Servus/issues/102 @@ -112,6 +113,9 @@ make test %{_datadir}/Servus %changelog +* Wed Aug 7 2024 Miroslav Suchý - 1.5.2-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.5.2-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 51346b20e83d693a5fc7e0cf7419d4c2378950df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:27:13 +0000 Subject: [PATCH 05/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index 9e278d5..6713bef 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -113,6 +113,9 @@ make test %{_datadir}/Servus %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.5.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Aug 7 2024 Miroslav Suchý - 1.5.2-13 - convert license to SPDX From 38db9b24a488f0e10ca8935c86272c9e08d21fa9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:10:15 +0000 Subject: [PATCH 06/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index 6713bef..525b5d7 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -113,6 +113,9 @@ make test %{_datadir}/Servus %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.5.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.5.2-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 36495df24cb9ee1e543200bc6e4120e97933247a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Jan 2026 16:03:12 +0100 Subject: [PATCH 07/14] Fixed build with cmake-4 and ninja MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- servus.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/servus.spec b/servus.spec index 525b5d7..37a9282 100644 --- a/servus.spec +++ b/servus.spec @@ -96,8 +96,7 @@ sed -i 's/%{version_major}\.%{version_minor}\.%{version_patch}/%{api_version}/g' popd %check -cd %{_vpath_builddir} -make test +%ctest %files %doc AUTHORS.txt LICENSE.txt README.md doc/Changelog.md From 8af5ec43fc9a040641171ed73b3c87a557432f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Jan 2026 17:53:18 +0100 Subject: [PATCH 08/14] Fixed build with cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- servus-1.5.2-cmake-4-fix.patch | 13 +++++++++++++ servus.spec | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 servus-1.5.2-cmake-4-fix.patch diff --git a/servus-1.5.2-cmake-4-fix.patch b/servus-1.5.2-cmake-4-fix.patch new file mode 100644 index 0000000..8721e66 --- /dev/null +++ b/servus-1.5.2-cmake-4-fix.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e62667a..3f2f76c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ + # along with this library; if not, write to the Free Software Foundation, Inc., + # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +-cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + project(Servus VERSION 1.6.0) + set(Servus_VERSION_ABI 6) + diff --git a/servus.spec b/servus.spec index 37a9282..2c72a9a 100644 --- a/servus.spec +++ b/servus.spec @@ -40,11 +40,13 @@ BuildRequires: desktop-file-utils BuildRequires: sed Provides: bundled(eyescale-cmake-common) = %{cmake_module_ver} # https://github.com/HBPVIS/Servus/pull/100 -Patch0: servus-1.5.2-stdexcept-fix.patch +Patch: servus-1.5.2-stdexcept-fix.patch # https://github.com/HBPVIS/Servus/pull/96 -Patch1: servus-1.5.2-copy-const-fix.patch +Patch: servus-1.5.2-copy-const-fix.patch # https://github.com/Eyescale/CMake/pull/599 -Patch2: servus-1.5.2-libdir-fix.patch +Patch: servus-1.5.2-libdir-fix.patch +# https://github.com/HBPVIS/Servus/issues/116 +Patch: servus-1.5.2-cmake-4-fix.patch %description Servus is a small C++ network utility library that provides a zeroconf API, From aed98a839f67dffd2ee97f70155b74b10996db87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Jan 2026 18:12:02 +0100 Subject: [PATCH 09/14] Fixed build with cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- servus-1.5.2-cmake-4-fix.patch | 26 ++++++++++++++++++++++++++ servus.spec | 1 + 2 files changed, 27 insertions(+) diff --git a/servus-1.5.2-cmake-4-fix.patch b/servus-1.5.2-cmake-4-fix.patch index 8721e66..ef12903 100644 --- a/servus-1.5.2-cmake-4-fix.patch +++ b/servus-1.5.2-cmake-4-fix.patch @@ -1,3 +1,29 @@ +diff --git a/CMake/common/Common.cmake b/CMake/common/Common.cmake +index 6e8d39d..234e86b 100644 +--- a/CMake/common/Common.cmake ++++ b/CMake/common/Common.cmake +@@ -19,7 +19,7 @@ + # - A -all target to build only the given (sub)project + # - A -install target to build and install the given (sub)project + +-cmake_minimum_required(VERSION 3.1 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.5 FATAL_ERROR) + + if(CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR) + message(FATAL_ERROR "Cannot install into build directory") +diff --git a/CMake/common/FindNumPy.cmake b/CMake/common/FindNumPy.cmake +index 4d729b2..94cee86 100644 +--- a/CMake/common/FindNumPy.cmake ++++ b/CMake/common/FindNumPy.cmake +@@ -3,7 +3,7 @@ + # PYTHON_NUMPY_FOUND + # will be set by this script + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + + if(NOT PYTHON_EXECUTABLE) + if(NumPy_FIND_QUIETLY) diff --git a/CMakeLists.txt b/CMakeLists.txt index e62667a..3f2f76c 100644 --- a/CMakeLists.txt diff --git a/servus.spec b/servus.spec index 2c72a9a..76fa7ba 100644 --- a/servus.spec +++ b/servus.spec @@ -46,6 +46,7 @@ Patch: servus-1.5.2-copy-const-fix.patch # https://github.com/Eyescale/CMake/pull/599 Patch: servus-1.5.2-libdir-fix.patch # https://github.com/HBPVIS/Servus/issues/116 +# https://github.com/Eyescale/CMake/pull/606 Patch: servus-1.5.2-cmake-4-fix.patch %description From 11cae9c1bf8f2496511e4ca2d09dfc9c4171a7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Jan 2026 18:31:26 +0100 Subject: [PATCH 10/14] Updated cmake-4-fix patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- servus-1.5.2-cmake-4-fix.patch | 10 +++++++++- servus.spec | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/servus-1.5.2-cmake-4-fix.patch b/servus-1.5.2-cmake-4-fix.patch index ef12903..8cd2d66 100644 --- a/servus-1.5.2-cmake-4-fix.patch +++ b/servus-1.5.2-cmake-4-fix.patch @@ -1,5 +1,5 @@ diff --git a/CMake/common/Common.cmake b/CMake/common/Common.cmake -index 6e8d39d..234e86b 100644 +index 6e8d39d..94e2960 100644 --- a/CMake/common/Common.cmake +++ b/CMake/common/Common.cmake @@ -19,7 +19,7 @@ @@ -11,6 +11,14 @@ index 6e8d39d..234e86b 100644 if(CMAKE_INSTALL_PREFIX STREQUAL PROJECT_BINARY_DIR) message(FATAL_ERROR "Cannot install into build directory") +@@ -29,7 +29,6 @@ cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain targ + cmake_policy(SET CMP0037 NEW) # Target names should not be reserved and should match a validity pattern. + cmake_policy(SET CMP0038 NEW) # Targets may not link directly to themselves. + cmake_policy(SET CMP0048 NEW) # The project() command manages VERSION variables. +-cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted. + + # WAR for CMake >=3.1 bug (observed with 3.2.3) + # If not set to false, any call to pkg_check_modules() or pkg_search_module() diff --git a/CMake/common/FindNumPy.cmake b/CMake/common/FindNumPy.cmake index 4d729b2..94cee86 100644 --- a/CMake/common/FindNumPy.cmake diff --git a/servus.spec b/servus.spec index 76fa7ba..3d56aae 100644 --- a/servus.spec +++ b/servus.spec @@ -47,7 +47,7 @@ Patch: servus-1.5.2-copy-const-fix.patch Patch: servus-1.5.2-libdir-fix.patch # https://github.com/HBPVIS/Servus/issues/116 # https://github.com/Eyescale/CMake/pull/606 -Patch: servus-1.5.2-cmake-4-fix.patch +#Patch: servus-1.5.2-cmake-4-fix.patch %description Servus is a small C++ network utility library that provides a zeroconf API, From c8744c1584089c380e90454283bf5a4bee4b3d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 12 Jan 2026 18:51:58 +0100 Subject: [PATCH 11/14] Enabled cmake-4-fix patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- servus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index 3d56aae..76fa7ba 100644 --- a/servus.spec +++ b/servus.spec @@ -47,7 +47,7 @@ Patch: servus-1.5.2-copy-const-fix.patch Patch: servus-1.5.2-libdir-fix.patch # https://github.com/HBPVIS/Servus/issues/116 # https://github.com/Eyescale/CMake/pull/606 -#Patch: servus-1.5.2-cmake-4-fix.patch +Patch: servus-1.5.2-cmake-4-fix.patch %description Servus is a small C++ network utility library that provides a zeroconf API, From 9b0f8aa4526377639193fdfe57a1802031150d49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2026 15:54:54 +0100 Subject: [PATCH 12/14] Fixed build with cmake-4 by switching from $LIB_SUFFIX to GNUInstallDirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- servus-1.5.2-cmake-4-fix.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/servus-1.5.2-cmake-4-fix.patch b/servus-1.5.2-cmake-4-fix.patch index 8cd2d66..17543ac 100644 --- a/servus-1.5.2-cmake-4-fix.patch +++ b/servus-1.5.2-cmake-4-fix.patch @@ -19,6 +19,35 @@ index 6e8d39d..94e2960 100644 # WAR for CMake >=3.1 bug (observed with 3.2.3) # If not set to false, any call to pkg_check_modules() or pkg_search_module() +diff --git a/CMake/common/CommonLibrary.cmake b/CMake/common/CommonLibrary.cmake +index 4ec9d9f..c887b30 100644 +--- a/CMake/common/CommonLibrary.cmake ++++ b/CMake/common/CommonLibrary.cmake +@@ -44,6 +44,7 @@ + + include(CommonCheckTargets) + include(InstallFiles) ++include(GNUInstallDirs) + + set(COMMON_LIBRARY_TYPE SHARED CACHE STRING + "Library type {any combination of SHARED, STATIC}") +@@ -142,14 +143,14 @@ function(common_library Name) + install(TARGETS ${LibName} + ARCHIVE DESTINATION lib COMPONENT dev + RUNTIME DESTINATION bin COMPONENT lib +- LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib + INCLUDES DESTINATION include) + else() + install(TARGETS ${LibName} + EXPORT ${PROJECT_NAME}Targets + ARCHIVE DESTINATION lib COMPONENT dev + RUNTIME DESTINATION bin COMPONENT lib +- LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib + INCLUDES DESTINATION include) + endif() + endif() diff --git a/CMake/common/FindNumPy.cmake b/CMake/common/FindNumPy.cmake index 4d729b2..94cee86 100644 --- a/CMake/common/FindNumPy.cmake From aa17dc4b73424161dd4f0ec405043a2c542a2634 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:54:58 +0000 Subject: [PATCH 13/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index 76fa7ba..f35aa67 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -115,6 +115,9 @@ popd %{_datadir}/Servus %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.5.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.5.2-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 51edae6c335cc4ee979a39f618d506960a63de68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:25:12 +0000 Subject: [PATCH 14/14] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- servus.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servus.spec b/servus.spec index f35aa67..8ae8c47 100644 --- a/servus.spec +++ b/servus.spec @@ -15,7 +15,7 @@ Version: 1.5.2 %global version_major 1 %global version_minor 6 %global version_patch 0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Zeroconf discovery in C++ # RSA license for the MD5 code which is based on the RSA licensed code @@ -115,6 +115,9 @@ popd %{_datadir}/Servus %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.5.2-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.5.2-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild