diff --git a/freerdp-2.11.7-port-to-newer-cmake.patch b/freerdp-2.11.7-port-to-newer-cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ec9e4fd19c94401c28013271c60b1c3a695d3a4 --- /dev/null +++ b/freerdp-2.11.7-port-to-newer-cmake.patch @@ -0,0 +1,35 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 67f3437..1fa65e0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...${CMAKE_VERSION}) + + project(FreeRDP C CXX) + +--- freerdp-2.11.7/rdtk/CMakeLists.txt.orig 2025-03-06 18:27:27.033641368 +0800 ++++ freerdp-2.11.7/rdtk/CMakeLists.txt 2025-03-06 18:27:36.343775988 +0800 +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...${CMAKE_VERSION}) + + project(RdTk C) + +--- freerdp-2.11.7/winpr/CMakeLists.txt.orig 2025-03-06 18:26:53.497156449 +0800 ++++ freerdp-2.11.7/winpr/CMakeLists.txt 2025-03-06 18:27:04.647317675 +0800 +@@ -15,7 +15,7 @@ + # See the License for the specific language governing permissions and + # limitations under the License. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...${CMAKE_VERSION}) + + project(WinPR C) + diff --git a/freerdp.spec b/freerdp.spec index a7fd6f62068079a9ad8992d3b2b8170c7a5cedc5..cd5ad989fa72bdc2484b223492c6d32774ecc14e 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,15 +1,16 @@ Name: freerdp Version: 2.11.7 -Release: 5 +Release: 6 Epoch: 2 Summary: A Remote Desktop Protocol Implementation License: Apache-2.0 -URL: http://www.freerdp.com +URL: https://www.freerdp.com Source0: https://github.com/FreeRDP/FreeRDP/releases/download/%{version}/freerdp-%{version}.tar.gz Patch0001: Fix-freerdp-shadow-cli-exit-codes-for-help-and-version.patch Patch0002: CVE-2024-32661.patch Patch0003: Fix-clang-incompatible-function-pointer-error.patch +Patch0004: freerdp-2.11.7-port-to-newer-cmake.patch BuildRequires: gcc gcc-c++ alsa-lib-devel cmake >= 2.8 cups-devel gsm-devel libXrandr-devel libXv-devel BuildRequires: libjpeg-turbo-devel libjpeg-turbo-devel libX11-devel libXcursor-devel libxkbfile-devel @@ -51,16 +52,12 @@ On Windows, you can use the native API and use it to change the code. %package -n libwinpr-devel Summary: Windows Portable Runtime development headers and libraries -Requires: libwinpr = %{?epoch}:%{version}-%{release} pkgconfig cmake >= 2.8 +Requires: libwinpr = %{?epoch}:%{version}-%{release} %description -n libwinpr-devel Development headers and libraries for freerdp-libwinpr. -%package help -Summary: Help documents for freerdp - -%description help -Man pages and other related help documents for freerdp. +%package_help %prep %autosetup -p1 -n %{name}-%{version} @@ -91,28 +88,13 @@ find . -name "*.c" -exec chmod 664 {} \; %install %cmake_install -find %{buildroot} -name "*.a" -delete - -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/freerdp2" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf - -%post -/sbin/ldconfig - -%postun -/sbin/ldconfig - -%post -n libwinpr -p /sbin/ldconfig - -%postun -n libwinpr -p /sbin/ldconfig - %files %license LICENSE %doc README.md ChangeLog -%{_libdir}/freerdp2/ +%dir %{_libdir}/freerdp2/ +%{_libdir}/freerdp2/*.so %{_bindir}/{winpr-hash,winpr-makecert,wlfreerdp,xfreerdp,freerdp-shadow-cli,freerdp-proxy} %{_libdir}/{libfreerdp*,libuwac0}.so.* -%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %files devel %{_includedir}/{freerdp2,uwac0} @@ -132,9 +114,12 @@ echo "%{_libdir}/freerdp2" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_ %{_libdir}/pkgconfig/{winpr2,winpr-tools2}.pc %files help -%{_mandir}/*/* +%{_mandir}/man?/* %changelog +* Thu Mar 06 2025 Funda Wang - 2:2.11.7-6 +- build with cmake 4.0 + * Tue Jan 28 2025 Funda Wang - 2:2.11.7-5 - fix build with cmake macro migration