Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yder for openSUSE:Factory checked in at 2023-09-21 22:14:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yder (Old) and /work/SRC/openSUSE:Factory/.yder.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yder" Thu Sep 21 22:14:04 2023 rev:17 rq:1112554 version:1.4.20 Changes: -------- --- /work/SRC/openSUSE:Factory/yder/yder.changes 2023-01-12 22:45:18.473206683 +0100 +++ /work/SRC/openSUSE:Factory/.yder.new.1770/yder.changes 2023-09-21 22:15:05.139526534 +0200 @@ -1,0 +2,7 @@ +Mon Sep 18 14:56:57 UTC 2023 - Martin Hauke <[email protected]> + +- Update to version 1.4.20 + * cmake: remove DownloadProject feature, now dependencies must + be previously installed + +------------------------------------------------------------------- Old: ---- yder-1.4.19.tar.gz New: ---- yder-1.4.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yder.spec ++++++ --- /var/tmp/diff_new_pack.b0DXpJ/_old 2023-09-21 22:15:06.095561231 +0200 +++ /var/tmp/diff_new_pack.b0DXpJ/_new 2023-09-21 22:15:06.099561376 +0200 @@ -19,7 +19,7 @@ %define sover 1_4 Name: yder -Version: 1.4.19 +Version: 1.4.20 Release: 0 Summary: Logging library written in C # Example programs in subfolder examples/ are licensed under MIT ++++++ yder-1.4.19.tar.gz -> yder-1.4.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/CHANGELOG.md new/yder-1.4.20/CHANGELOG.md --- old/yder-1.4.19/CHANGELOG.md 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/CHANGELOG.md 2023-09-16 23:38:44.000000000 +0200 @@ -1,5 +1,9 @@ # Yder Changelog +## 1.4.20 + +- cmake: remove `DownloadProject` feature, now dependencies must be previously installed + ## 1.4.19 - Improve cmake script and MSVC support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/CMakeLists.txt new/yder-1.4.20/CMakeLists.txt --- old/yder-1.4.19/CMakeLists.txt 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/CMakeLists.txt 2023-09-16 23:38:44.000000000 +0200 @@ -30,7 +30,7 @@ set(PROJECT_BUGREPORT_PATH "https://github.com/babelouest/yder/issues";) set(LIBRARY_VERSION_MAJOR "1") set(LIBRARY_VERSION_MINOR "4") -set(LIBRARY_VERSION_PATCH "19") +set(LIBRARY_VERSION_PATCH "20") set(PROJECT_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(PROJECT_VERSION_MAJOR ${LIBRARY_VERSION_MAJOR}) @@ -56,7 +56,7 @@ set(LIBRARY_VERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}.${LIBRARY_VERSION_PATCH}") set(LIBRARY_SOVERSION "${LIBRARY_VERSION_MAJOR}.${LIBRARY_VERSION_MINOR}") -set(ORCANIA_VERSION_REQUIRED "2.3.2") +set(ORCANIA_VERSION_REQUIRED "2.3.3") # cmake modules @@ -165,50 +165,11 @@ set(yder_lib yder) endif() -option(DOWNLOAD_DEPENDENCIES "Download required dependencies" ON) - -option(SEARCH_ORCANIA "Search for Orcania library" ON) -if (SEARCH_ORCANIA) - find_package(Orcania ${ORCANIA_VERSION_REQUIRED} QUIET) # try to find orcania - if (NOT Orcania_FOUND) - if (DOWNLOAD_DEPENDENCIES) - include(DownloadProject) - download_project(PROJ orcania # ... otherwise, download archive - URL "https://github.com/babelouest/orcania/archive/v${ORCANIA_VERSION_REQUIRED}.tar.gz"; - QUIET) - add_subdirectory(${orcania_SOURCE_DIR} ${orcania_BINARY_DIR}) - # The following lines can be removed once Orcania has full target support - if (TARGET orcania) - if (NOT TARGET Orcania::Orcania) - add_library(Orcania::Orcania INTERFACE IMPORTED) - set_target_properties(Orcania::Orcania PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${orcania_SOURCE_DIR};${orcania_SOURCE_DIR}/include;${orcania_BINARY_DIR}" - INTERFACE_LINK_LIBRARIES orcania) - endif () - endif () - if (TARGET orcania_static) - if (NOT TARGET Orcania::Orcania-static) - add_library(Orcania::Orcania-static INTERFACE IMPORTED) - set_target_properties(Orcania::Orcania-static PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${orcania_SOURCE_DIR};${orcania_SOURCE_DIR}/include;${orcania_BINARY_DIR}" - INTERFACE_LINK_LIBRARIES orcania-_static) - endif () - endif () - else () - message( FATAL_ERROR "Orcania not found") - endif () - else() - if ("${ORCANIA_VERSION_STRING}" VERSION_GREATER_EQUAL "${ORCANIA_VERSION_REQUIRED}") - message(STATUS "Orcania found: ${ORCANIA_VERSION_STRING}") - else () - message( FATAL_ERROR "Orcania version required: ${ORCANIA_VERSION_REQUIRED} - version installed: ${ORCANIA_VERSION_STRING}") - endif () - endif () +find_package(Orcania ${ORCANIA_VERSION_REQUIRED} REQUIRED) +if ("${ORCANIA_VERSION_STRING}" VERSION_GREATER_EQUAL "${ORCANIA_VERSION_REQUIRED}") + message(STATUS "Orcania found: ${ORCANIA_VERSION_STRING}") else () - if (NOT TARGET Orcania::Orcania) - add_library(Orcania::Orcania INTERFACE IMPORTED) - set_target_properties(Orcania::Orcania PROPERTIES INTERFACE_LINK_LIBRARIES "orcania") - endif () + message( FATAL_ERROR "Orcania version required: ${ORCANIA_VERSION_REQUIRED} - version installed: ${ORCANIA_VERSION_STRING}") endif () if (BUILD_SHARED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/README.md new/yder-1.4.20/README.md --- old/yder-1.4.19/README.md 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/README.md 2023-09-16 23:38:44.000000000 +0200 @@ -39,9 +39,10 @@ Run the CMake script in a sub-directory, example: +Last Yder release: [https://github.com/babelouest/yder/releases/latest/](https://github.com/babelouest/yder/releases/latest/) + ```shell -$ git clone https://github.com/babelouest/yder.git -$ cd yder/ +$ cd <yder_source> $ mkdir build $ cd build $ cmake .. @@ -61,8 +62,9 @@ Download Yder from GitHub repository, compile and install. +Last Yder release: [https://github.com/babelouest/yder/releases/latest/](https://github.com/babelouest/yder/releases/latest/) + ```shell -$ git clone https://github.com/babelouest/yder.git $ cd yder/src $ make $ sudo make install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/cmake-modules/DownloadProject.CMakeLists.cmake.in new/yder-1.4.20/cmake-modules/DownloadProject.CMakeLists.cmake.in --- old/yder-1.4.19/cmake-modules/DownloadProject.CMakeLists.cmake.in 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/cmake-modules/DownloadProject.CMakeLists.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# Distributed under the OSI-approved MIT License. See accompanying -# file LICENSE or https://github.com/Crascit/DownloadProject for details. - -cmake_minimum_required(VERSION 2.8.12) - -project(${DL_ARGS_PROJ}-download NONE) - -include(ExternalProject) -ExternalProject_Add(${DL_ARGS_PROJ}-download - ${DL_ARGS_UNPARSED_ARGUMENTS} - SOURCE_DIR "${DL_ARGS_SOURCE_DIR}" - BINARY_DIR "${DL_ARGS_BINARY_DIR}" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "" -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/cmake-modules/DownloadProject.cmake new/yder-1.4.20/cmake-modules/DownloadProject.cmake --- old/yder-1.4.19/cmake-modules/DownloadProject.cmake 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/cmake-modules/DownloadProject.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,182 +0,0 @@ -# Distributed under the OSI-approved MIT License. See accompanying -# file LICENSE or https://github.com/Crascit/DownloadProject for details. -# -# MODULE: DownloadProject -# -# PROVIDES: -# download_project( PROJ projectName -# [PREFIX prefixDir] -# [DOWNLOAD_DIR downloadDir] -# [SOURCE_DIR srcDir] -# [BINARY_DIR binDir] -# [QUIET] -# ... -# ) -# -# Provides the ability to download and unpack a tarball, zip file, git repository, -# etc. at configure time (i.e. when the cmake command is run). How the downloaded -# and unpacked contents are used is up to the caller, but the motivating case is -# to download source code which can then be included directly in the build with -# add_subdirectory() after the call to download_project(). Source and build -# directories are set up with this in mind. -# -# The PROJ argument is required. The projectName value will be used to construct -# the following variables upon exit (obviously replace projectName with its actual -# value): -# -# projectName_SOURCE_DIR -# projectName_BINARY_DIR -# -# The SOURCE_DIR and BINARY_DIR arguments are optional and would not typically -# need to be provided. They can be specified if you want the downloaded source -# and build directories to be located in a specific place. The contents of -# projectName_SOURCE_DIR and projectName_BINARY_DIR will be populated with the -# locations used whether you provide SOURCE_DIR/BINARY_DIR or not. -# -# The DOWNLOAD_DIR argument does not normally need to be set. It controls the -# location of the temporary CMake build used to perform the download. -# -# The PREFIX argument can be provided to change the base location of the default -# values of DOWNLOAD_DIR, SOURCE_DIR and BINARY_DIR. If all of those three arguments -# are provided, then PREFIX will have no effect. The default value for PREFIX is -# CMAKE_BINARY_DIR. -# -# The QUIET option can be given if you do not want to show the output associated -# with downloading the specified project. -# -# In addition to the above, any other options are passed through unmodified to -# ExternalProject_Add() to perform the actual download, patch and update steps. -# The following ExternalProject_Add() options are explicitly prohibited (they -# are reserved for use by the download_project() command): -# -# CONFIGURE_COMMAND -# BUILD_COMMAND -# INSTALL_COMMAND -# TEST_COMMAND -# -# Only those ExternalProject_Add() arguments which relate to downloading, patching -# and updating of the project sources are intended to be used. Also note that at -# least one set of download-related arguments are required. -# -# If using CMake 3.2 or later, the UPDATE_DISCONNECTED option can be used to -# prevent a check at the remote end for changes every time CMake is run -# after the first successful download. See the documentation of the ExternalProject -# module for more information. It is likely you will want to use this option if it -# is available to you. Note, however, that the ExternalProject implementation contains -# bugs which result in incorrect handling of the UPDATE_DISCONNECTED option when -# using the URL download method or when specifying a SOURCE_DIR with no download -# method. Fixes for these have been created, the last of which is scheduled for -# inclusion in CMake 3.8.0. Details can be found here: -# -# https://gitlab.kitware.com/cmake/cmake/commit/bdca68388bd57f8302d3c1d83d691034b7ffa70c -# https://gitlab.kitware.com/cmake/cmake/issues/16428 -# -# If you experience build errors related to the update step, consider avoiding -# the use of UPDATE_DISCONNECTED. -# -# EXAMPLE USAGE: -# -# include(DownloadProject) -# download_project(PROJ googletest -# GIT_REPOSITORY https://github.com/google/googletest.git -# GIT_TAG master -# UPDATE_DISCONNECTED 1 -# QUIET -# ) -# -# add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR}) -# -#======================================================================================== - - -set(_DownloadProjectDir "${CMAKE_CURRENT_LIST_DIR}") - -include(CMakeParseArguments) - -function(download_project) - - set(options QUIET) - set(oneValueArgs - PROJ - PREFIX - DOWNLOAD_DIR - SOURCE_DIR - BINARY_DIR - # Prevent the following from being passed through - CONFIGURE_COMMAND - BUILD_COMMAND - INSTALL_COMMAND - TEST_COMMAND - ) - set(multiValueArgs "") - - cmake_parse_arguments(DL_ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - # Hide output if requested - if (DL_ARGS_QUIET) - set(OUTPUT_QUIET "OUTPUT_QUIET") - else() - unset(OUTPUT_QUIET) - message(STATUS "Downloading/updating ${DL_ARGS_PROJ}") - endif() - - # Set up where we will put our temporary CMakeLists.txt file and also - # the base point below which the default source and binary dirs will be. - # The prefix must always be an absolute path. - if (NOT DL_ARGS_PREFIX) - set(DL_ARGS_PREFIX "${CMAKE_BINARY_DIR}") - else() - get_filename_component(DL_ARGS_PREFIX "${DL_ARGS_PREFIX}" ABSOLUTE - BASE_DIR "${CMAKE_CURRENT_BINARY_DIR}") - endif() - if (NOT DL_ARGS_DOWNLOAD_DIR) - set(DL_ARGS_DOWNLOAD_DIR "${DL_ARGS_PREFIX}/${DL_ARGS_PROJ}-download") - endif() - - # Ensure the caller can know where to find the source and build directories - if (NOT DL_ARGS_SOURCE_DIR) - set(DL_ARGS_SOURCE_DIR "${DL_ARGS_PREFIX}/${DL_ARGS_PROJ}-src") - endif() - if (NOT DL_ARGS_BINARY_DIR) - set(DL_ARGS_BINARY_DIR "${DL_ARGS_PREFIX}/${DL_ARGS_PROJ}-build") - endif() - set(${DL_ARGS_PROJ}_SOURCE_DIR "${DL_ARGS_SOURCE_DIR}" PARENT_SCOPE) - set(${DL_ARGS_PROJ}_BINARY_DIR "${DL_ARGS_BINARY_DIR}" PARENT_SCOPE) - - # The way that CLion manages multiple configurations, it causes a copy of - # the CMakeCache.txt to be copied across due to it not expecting there to - # be a project within a project. This causes the hard-coded paths in the - # cache to be copied and builds to fail. To mitigate this, we simply - # remove the cache if it exists before we configure the new project. It - # is safe to do so because it will be re-generated. Since this is only - # executed at the configure step, it should not cause additional builds or - # downloads. - file(REMOVE "${DL_ARGS_DOWNLOAD_DIR}/CMakeCache.txt") - - # Create and build a separate CMake project to carry out the download. - # If we've already previously done these steps, they will not cause - # anything to be updated, so extra rebuilds of the project won't occur. - # Make sure to pass through CMAKE_MAKE_PROGRAM in case the main project - # has this set to something not findable on the PATH. - configure_file("${_DownloadProjectDir}/DownloadProject.CMakeLists.cmake.in" - "${DL_ARGS_DOWNLOAD_DIR}/CMakeLists.txt") - execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" - -D "CMAKE_MAKE_PROGRAM:FILE=${CMAKE_MAKE_PROGRAM}" - . - RESULT_VARIABLE result - ${OUTPUT_QUIET} - WORKING_DIRECTORY "${DL_ARGS_DOWNLOAD_DIR}" - ) - if(result) - message(FATAL_ERROR "CMake step for ${DL_ARGS_PROJ} failed: ${result}") - endif() - execute_process(COMMAND ${CMAKE_COMMAND} --build . - RESULT_VARIABLE result - ${OUTPUT_QUIET} - WORKING_DIRECTORY "${DL_ARGS_DOWNLOAD_DIR}" - ) - if(result) - message(FATAL_ERROR "Build step for ${DL_ARGS_PROJ} failed: ${result}") - endif() - -endfunction() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/cmake-modules/FindOrcania.cmake new/yder-1.4.20/cmake-modules/FindOrcania.cmake --- old/yder-1.4.19/cmake-modules/FindOrcania.cmake 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/cmake-modules/FindOrcania.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -#.rst: -# FindOrcania -# ----------- -# -# Find Orcania -# -# Find Orcania headers and libraries. -# -# :: -# -# ORCANIA_FOUND - True if Orcania found. -# ORCANIA_INCLUDE_DIRS - Where to find orcania.h. -# ORCANIA_LIBRARIES - List of libraries when using Orcania. -# ORCANIA_VERSION_STRING - The version of Orcania found. - -#============================================================================= -# Copyright 2018 Silvio Clecio <[email protected]> -# Copyright 2018 Nicolas Mora <[email protected]> -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License -# as published by the Free Software Foundation; -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU GENERAL PUBLIC LICENSE for more details. -# -# You should have received a copy of the GNU General Public -# License along with this library. If not, see <http://www.gnu.org/licenses/>. -#============================================================================= - -find_package(PkgConfig QUIET) -pkg_check_modules(PC_ORCANIA QUIET liborcania) - -find_path(ORCANIA_INCLUDE_DIR - NAMES orcania.h - HINTS ${PC_ORCANIA_INCLUDEDIR} ${PC_ORCANIA_INCLUDE_DIRS}) - -find_library(ORCANIA_LIBRARY - NAMES orcania liborcania orcania-static - HINTS ${PC_ORCANIA_LIBDIR} ${PC_ORCANIA_LIBRARY_DIRS}) - -set(ORCANIA_VERSION_STRING 0.0.0) -if (PC_ORCANIA_VERSION) - set(ORCANIA_VERSION_STRING ${PC_ORCANIA_VERSION}) -elseif (ORCANIA_INCLUDE_DIR AND EXISTS "${ORCANIA_INCLUDE_DIR}/orcania.h") - set(regex_orcania_version "^#define[ \t]+ORCANIA_VERSION[ \t]+([^\"]+).*") - file(STRINGS "${ORCANIA_INCLUDE_DIR}/orcania.h" orcania_version REGEX "${regex_orcania_version}") - string(REGEX REPLACE "${regex_orcania_version}" "\\1" ORCANIA_VERSION_STRING "${orcania_version}") - unset(regex_orcania_version) - unset(orcania_version) - if (NOT ORCANIA_VERSION_STRING) - set(regex_orcania_version "^#define[ \t]+ORCANIA_VERSION[ \t]+([^\"]+).*") - file(STRINGS "${ORCANIA_INCLUDE_DIR}/orcania-cfg.h" orcania_version REGEX "${regex_orcania_version}") - string(REGEX REPLACE "${regex_orcania_version}" "\\1" ORCANIA_VERSION_STRING "${orcania_version}") - unset(regex_orcania_version) - unset(orcania_version) - endif () -endif () - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Orcania - REQUIRED_VARS ORCANIA_LIBRARY ORCANIA_INCLUDE_DIR - VERSION_VAR ORCANIA_VERSION_STRING) - -if (PC_ORCANIA_FOUND) - set(Orcania_FOUND TRUE) -endif () - -if (ORCANIA_FOUND) - set(ORCANIA_LIBRARIES ${ORCANIA_LIBRARY}) - set(ORCANIA_INCLUDE_DIRS ${ORCANIA_INCLUDE_DIR}) - if (NOT TARGET Orcania::Orcania) - add_library(Orcania::Orcania UNKNOWN IMPORTED) - set_target_properties(Orcania::Orcania PROPERTIES - IMPORTED_LOCATION "${ORCANIA_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${ORCANIA_INCLUDE_DIR}") - endif () -endif () - -mark_as_advanced(ORCANIA_INCLUDE_DIR ORCANIA_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/doc/doxygen.cfg new/yder-1.4.20/doc/doxygen.cfg --- old/yder-1.4.19/doc/doxygen.cfg 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/doc/doxygen.cfg 2023-09-16 23:38:44.000000000 +0200 @@ -14,7 +14,6 @@ CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO OUTPUT_LANGUAGE = English -OUTPUT_TEXT_DIRECTION = None BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -70,3 +69,4 @@ MACRO_EXPANSION = NO EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES +HAVE_DOT = NO diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yder-1.4.19/src/Makefile new/yder-1.4.20/src/Makefile --- old/yder-1.4.19/src/Makefile 2022-12-17 22:22:34.000000000 +0100 +++ new/yder-1.4.20/src/Makefile 2023-09-16 23:38:44.000000000 +0200 @@ -35,7 +35,7 @@ OUTPUT=libyder.so VERSION_MAJOR=1 VERSION_MINOR=4 -VERSION_PATCH=19 +VERSION_PATCH=20 SONAME = -soname ifeq ($(shell uname -s),Darwin)
