Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package freerdp2 for openSUSE:Factory
checked in at 2024-04-11 19:42:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/freerdp2 (Old)
and /work/SRC/openSUSE:Factory/.freerdp2.new.29460 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freerdp2"
Thu Apr 11 19:42:01 2024 rev:2 rq:1166893 version:2.11.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/freerdp2/freerdp2.changes 2024-04-03
17:19:39.579824226 +0200
+++ /work/SRC/openSUSE:Factory/.freerdp2.new.29460/freerdp2.changes
2024-04-11 19:42:26.800631781 +0200
@@ -1,0 +2,6 @@
+Tue Apr 9 19:40:24 UTC 2024 - Christophe Marin <christo...@krop.fr>
+
+- Add patch to avoid unneeded dependencies when using winpr-devel:
+ * 0001-Don-t-add-winpr-cli-tools-to-exported-CMake-targets.patch
+
+-------------------------------------------------------------------
New:
----
0001-Don-t-add-winpr-cli-tools-to-exported-CMake-targets.patch
BETA DEBUG BEGIN:
New:- Add patch to avoid unneeded dependencies when using winpr-devel:
* 0001-Don-t-add-winpr-cli-tools-to-exported-CMake-targets.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ freerdp2.spec ++++++
--- /var/tmp/diff_new_pack.3DnEQp/_old 2024-04-11 19:42:27.408654273 +0200
+++ /var/tmp/diff_new_pack.3DnEQp/_new 2024-04-11 19:42:27.408654273 +0200
@@ -46,6 +46,8 @@
Patch0: 0001-Make-H.264-codec-optional-during-runtime.patch
# PATCH-FIX-UPSTREAM CVE-2023-40574, CVE-2023-40575, CVE-2023-40576,
bsc#1214869, bsc#1214870, bsc#1214871 -- yu.da...@suse.com
Patch1: freerdp-CVE-2023-40574-to-2023-40576.patch
+# PATCH-FIX-OPENSUSE -- Don't let 'cmake(WinPR)' require unneeded tools
+Patch2: 0001-Don-t-add-winpr-cli-tools-to-exported-CMake-targets.patch
BuildRequires: cmake >= 2.8
BuildRequires: cups-devel
BuildRequires: ed
@@ -140,8 +142,6 @@
Summary: Windows Portable Runtime development files
Group: Development/Languages/C and C++
Requires: cmake >= 2.8
-# WinPRTargets-*.cmake defines targets for winpr-hash and winpr-makecert
-Requires: freerdp2-server = %{version}-%{release}
Requires: libwinpr%{libfreerdp_package} = %{version}-%{release}
Obsoletes: libwinpr2-devel < %{version}-%{release}
Provides: libwinpr2-devel = %{version}-%{release}
++++++ 0001-Don-t-add-winpr-cli-tools-to-exported-CMake-targets.patch ++++++
>From 8964e04720449f27d5e1ddfcd6dff01302f9b84e Mon Sep 17 00:00:00 2001
From: Christophe Marin <christo...@krop.fr>
Date: Tue, 9 Apr 2024 21:37:27 +0200
Subject: [PATCH] Don't add winpr cli tools to exported CMake targets
Adding CMake exports for executables means they'll be required at build time
when
another package needs 'cmake(WinPR)'.
Besides, they get renamed after installation to allow coinstalling FreeRDP 2
and 3.
---
winpr/tools/hash-cli/CMakeLists.txt | 2 +-
winpr/tools/makecert-cli/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/winpr/tools/hash-cli/CMakeLists.txt
b/winpr/tools/hash-cli/CMakeLists.txt
index 9f8c7a8..b6d048f 100644
--- a/winpr/tools/hash-cli/CMakeLists.txt
+++ b/winpr/tools/hash-cli/CMakeLists.txt
@@ -43,7 +43,7 @@ set(${MODULE_PREFIX}_LIBS winpr)
target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT
tools EXPORT WinPRTargets)
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT
tools)
if (WITH_DEBUG_SYMBOLS AND MSVC)
install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION
${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
diff --git a/winpr/tools/makecert-cli/CMakeLists.txt
b/winpr/tools/makecert-cli/CMakeLists.txt
index 48fda5b..c7cf4bf 100644
--- a/winpr/tools/makecert-cli/CMakeLists.txt
+++ b/winpr/tools/makecert-cli/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS}
winpr)
set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
-install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT
tools EXPORT WinPRTargets)
+install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT
tools)
if (WITH_DEBUG_SYMBOLS AND MSVC)
install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION
${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
endif()
--
2.44.0
