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..17543ac --- /dev/null +++ b/servus-1.5.2-cmake-4-fix.patch @@ -0,0 +1,76 @@ +diff --git a/CMake/common/Common.cmake b/CMake/common/Common.cmake +index 6e8d39d..94e2960 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") +@@ -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/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 ++++ 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 ++++ 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 820785c..8ae8c47 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: 9%{?dist} +Release: 17%{?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 @@ -39,11 +40,14 @@ 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 +# https://github.com/Eyescale/CMake/pull/606 +Patch: servus-1.5.2-cmake-4-fix.patch %description Servus is a small C++ network utility library that provides a zeroconf API, @@ -95,8 +99,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 @@ -112,6 +115,30 @@ make test %{_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 + +* 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 + +* 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 + +* 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 + * Sat Jan 21 2023 Fedora Release Engineering - 1.5.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild