Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package AusweisApp for openSUSE:Factory checked in at 2026-10-09 21:45:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/AusweisApp (Old) and /work/SRC/openSUSE:Factory/.AusweisApp.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "AusweisApp" Fri Oct 9 21:45:55 2026 rev:24 rq:1383700 version:2.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/AusweisApp/AusweisApp.changes 2026-10-07 19:35:46.263601975 +0200 +++ /work/SRC/openSUSE:Factory/.AusweisApp.new.3698736/AusweisApp.changes 2026-10-09 21:47:02.086487362 +0200 @@ -1,0 +2,5 @@ +Fri Oct 9 08:20:45 UTC 2026 - John Paul Adrian Glaubitz <[email protected]> + +- Add fix-version-info.patch to fix incorrect version info + +------------------------------------------------------------------- New: ---- fix-version-info.patch ----------(New B)---------- New: - Add fix-version-info.patch to fix incorrect version info ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ AusweisApp.spec ++++++ --- /var/tmp/diff_new_pack.BrFhf7/_old 2026-10-09 21:47:04.948607799 +0200 +++ /var/tmp/diff_new_pack.BrFhf7/_new 2026-10-09 21:47:04.951607925 +0200 @@ -24,6 +24,7 @@ Group: Productivity/Security URL: https://www.ausweisapp.bund.de Source0: https://github.com/Governikus/AusweisApp2/archive/%{version}.tar.gz +Patch0: https://raw.githubusercontent.com/flathub/de.bund.ausweisapp.ausweisapp2/refs/heads/master/version.patch#/fix-version-info.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -63,6 +64,7 @@ %prep %setup -q -n %{name}-%{version} +%patch -P0 -p1 %build export CFLAGS="%{optflags} -fPIC" ++++++ fix-version-info.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,6 +138,7 @@ endif() include(Tools) include(DVCS) +GET_DVCS_INFO(${CMAKE_SOURCE_DIR}) add_subdirectory(docs) include(Messages) diff --git a/ci/runner/Script.cmake b/ci/runner/Script.cmake --- a/ci/runner/Script.cmake +++ b/ci/runner/Script.cmake @@ -164,6 +164,7 @@ macro(FETCH_VERSION) PROPAGATE_PARAM(USE_APPSTORE_PROFILE) include(Version) include(DVCS) + GET_DVCS_INFO(${CMAKE_SOURCE_DIR}) list(POP_BACK CMAKE_MODULE_PATH) set(BRANCH ${dvcs_branch}) diff --git a/cmake/DVCS.cmake b/cmake/DVCS.cmake --- a/cmake/DVCS.cmake +++ b/cmake/DVCS.cmake @@ -41,52 +41,59 @@ function(DVCS_CALL _name ${ARGN}) endfunction() -macro(GET_DVCS_INFO) - set(USE_ARTIFACT_DEV_VERSION ON) +macro(GET_DVCS_INFO _source_dir) + option(ENABLE_DVCS "Check consistency of version/tag and get additional revision data" ON) + if(ENABLE_DVCS) + FIND_DVCS(${_source_dir}) + endif() + + if(DVCS_FOUND) + set(USE_ARTIFACT_DEV_VERSION ON) - if(DEFINED PROJECT_VERSION) - if(HG_FOUND) - DVCS_CALL("tag" id -t) - elseif(GIT_FOUND) - DVCS_CALL("tag" tag -l --points-at HEAD) - endif() - if(NOT "${dvcs_tag}" STREQUAL "tip" AND NOT "${dvcs_tag}" STREQUAL "" AND NOT "${dvcs_tag}" STREQUAL "undefined") - if(NOT dvcs_tag STREQUAL PROJECT_VERSION) - message(FATAL_ERROR "DVCS Tag and defined PROJECT_VERSION is not equal") + if(DEFINED PROJECT_VERSION) + if(HG_FOUND) + DVCS_CALL("tag" id -t) + elseif(GIT_FOUND) + DVCS_CALL("tag" tag -l --points-at HEAD) endif() - set(USE_ARTIFACT_DEV_VERSION OFF) - else() - if(HG_FOUND) - DVCS_EXECUTE(dvcs_distance log -r ${PROJECT_VERSION}::. --template 1) - string(LENGTH "${dvcs_distance}" dvcs_distance) - message(STATUS "DVCS distance: ${dvcs_distance}") - elseif(GIT_FOUND) - DVCS_CALL("distance" rev-list --count ${PROJECT_VERSION}...HEAD) + if(NOT "${dvcs_tag}" STREQUAL "tip" AND NOT "${dvcs_tag}" STREQUAL "" AND NOT "${dvcs_tag}" STREQUAL "undefined") + if(NOT dvcs_tag STREQUAL PROJECT_VERSION) + message(FATAL_ERROR "DVCS Tag and defined PROJECT_VERSION is not equal") + endif() + set(USE_ARTIFACT_DEV_VERSION OFF) + else() + if(HG_FOUND) + DVCS_EXECUTE(dvcs_distance log -r ${PROJECT_VERSION}::. --template 1) + string(LENGTH "${dvcs_distance}" dvcs_distance) + message(STATUS "DVCS distance: ${dvcs_distance}") + elseif(GIT_FOUND) + DVCS_CALL("distance" rev-list --count ${PROJECT_VERSION}...HEAD) + endif() endif() endif() - endif() - if(HG_FOUND) - DVCS_CALL("branch" branch) - elseif(GIT_FOUND) - DVCS_CALL("branch" rev-parse --abbrev-ref HEAD) - endif() + if(HG_FOUND) + DVCS_CALL("branch" branch) + elseif(GIT_FOUND) + DVCS_CALL("branch" rev-parse --abbrev-ref HEAD) + endif() - if(HG_FOUND) - DVCS_CALL("revision" id -i) - elseif(GIT_FOUND) - DVCS_CALL("revision" rev-parse --verify --short HEAD) - endif() + if(HG_FOUND) + DVCS_CALL("revision" id -i) + elseif(GIT_FOUND) + DVCS_CALL("revision" rev-parse --verify --short HEAD) + endif() - if(HG_FOUND) - DVCS_CALL("phase" log -r . -T {phase}) - if(DEFINED dvcs_phase) - if("${dvcs_phase}" STREQUAL "public") - if("${dvcs_revision}" MATCHES "\\+") - set(dvcs_phase "draft") - message(STATUS "DVCS phase: ${dvcs_phase} (override)") - else() - unset(dvcs_phase) + if(HG_FOUND) + DVCS_CALL("phase" log -r . -T {phase}) + if(DEFINED dvcs_phase) + if("${dvcs_phase}" STREQUAL "public") + if("${dvcs_revision}" MATCHES "\\+") + set(dvcs_phase "draft") + message(STATUS "DVCS phase: ${dvcs_phase} (override)") + else() + unset(dvcs_phase) + endif() endif() endif() endif() @@ -142,11 +149,3 @@ macro(GET_DVCS_INFO) endif() endif() endmacro() - -FIND_DVCS(${CMAKE_SOURCE_DIR}) -if(DVCS_FOUND) - option(ENABLE_DVCS "Check consistency of version/tag and get additional revision data" true) - if(ENABLE_DVCS) - GET_DVCS_INFO() - endif() -endif() diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -855,9 +855,8 @@ endif() string(TIMESTAMP stamp "%Y-%m-%d") set(IDENTIFIER ${stamp}) -FIND_DVCS(${PROJECT_SOURCE_DIR}/..) +GET_DVCS_INFO(${PROJECT_SOURCE_DIR}/..) if(DVCS_FOUND) - GET_DVCS_INFO() list(APPEND LIBS_ID_SALT ${dvcs_branch}) if(DEFINED dvcs_phase)
