From 2fbf31faddc164edae32d14b41a368aad7739889 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Fri, 15 May 2020 14:12:29 +0200 Subject: [PATCH 1/3] Update to 2.1.0 The 2.0.0 stable version was finally published before some time and contains many bug and security fixes. Also, the first minor stable release 2.1.0 has been released recently. Upstream promised that will support the stable release at least for two years and will make minor releases regularly. So let's update to 2.1.0 and use the traditional versioning scheme in hope that we will update the package just with official releases... Resolves: rhbz#1833540 --- .gitignore | 1 + freerdp.spec | 15 +++++++-------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9b03c08..e4c1466 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /FreeRDP-b907324.tar.gz /FreeRDP-6015229.tar.gz /FreeRDP-245fc60.tar.gz +/FreeRDP-2.1.0.tar.gz diff --git a/freerdp.spec b/freerdp.spec index 16fb2dc..5ac8ab6 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,7 +1,3 @@ -%global commit0 245fc6014d4707b24bcd812e8f0640f78664526d -%global date 20200207 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - # Can be rebuilt with FFmpeg/H264 support enabled by passing "--with=ffmpeg", # "--with=x264" or "--with=openh264" to mock/rpmbuild; or by globally setting # these variables: @@ -19,14 +15,14 @@ %{!?rhel:%global _with_server 1} Name: freerdp -Version: 2.0.0 -Release: 56.%{date}git%{shortcommit0}%{?dist} +Version: 2.1.0 +Release: 1%{?dist} Epoch: 2 Summary: Free implementation of the Remote Desktop Protocol (RDP) License: ASL 2.0 URL: http://www.freerdp.com/ -Source0: https://github.com/FreeRDP/FreeRDP/archive/%{commit0}/FreeRDP-%{commit0}.tar.gz#/FreeRDP-%{shortcommit0}.tar.gz +Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}/FreeRDP-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ @@ -146,7 +142,7 @@ The %{name}-libwinpr-devel package contains libraries and header files for developing applications that use %{name}-libwinpr. %prep -%autosetup -p1 -n FreeRDP-%{commit0} +%autosetup -p1 -n FreeRDP-%{version} # Rpmlint fixes find . -name "*.h" -exec chmod 664 {} \; @@ -297,6 +293,9 @@ find %{buildroot} -name "*.a" -delete %{_libdir}/pkgconfig/winpr-tools2.pc %changelog +* Thu May 14 2020 Ondrej Holy - 2:2.1.0-1 +- Update to 2.1.0 (#1833540). + * Fri Feb 07 2020 Simone Caronni - 2:2.0.0-56.20200207git245fc60 - Update to latest snapshot. diff --git a/sources b/sources index 5466b1c..9bfb282 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FreeRDP-245fc60.tar.gz) = d6de9d229bcbe150fa65e27dfa86884bde2c88378daed4876f0c7db3af502ae31a021b89439a640353c8c6918cf26f89a472ab0a02b72c83a4063769850ca47e +SHA512 (FreeRDP-2.1.0.tar.gz) = afed8893128067b688bf5ba87e7d28296ece3b4848d84653ab0ad0c3723b6a8bc36733aca9649fb29a0d4a53b39fdd49d56d17e9b4eac8bf7b06fa4b27e66b14 From cafd345318bdeef43884a21fcdb2208d14a22e22 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Thu, 21 May 2020 15:01:25 +0200 Subject: [PATCH 2/3] Add libusb-1.0 dependency The urbdrc channel is now built by default, so let's add libusb-1.0 dependency to fix the build. --- freerdp.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/freerdp.spec b/freerdp.spec index 5ac8ab6..7072632 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -65,6 +65,7 @@ BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(libpcsclite) BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(soxr) BuildRequires: pkgconfig(wayland-client) From 978871d95ce564e6c7dfc7a34d2d89463c7dce5a Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Thu, 21 May 2020 15:03:14 +0200 Subject: [PATCH 3/3] Update to 2.1.1 --- .gitignore | 1 + freerdp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e4c1466..40cac9d 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /FreeRDP-6015229.tar.gz /FreeRDP-245fc60.tar.gz /FreeRDP-2.1.0.tar.gz +/FreeRDP-2.1.1.tar.gz diff --git a/freerdp.spec b/freerdp.spec index 7072632..aef40bc 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -15,7 +15,7 @@ %{!?rhel:%global _with_server 1} Name: freerdp -Version: 2.1.0 +Version: 2.1.1 Release: 1%{?dist} Epoch: 2 Summary: Free implementation of the Remote Desktop Protocol (RDP) @@ -294,6 +294,9 @@ find %{buildroot} -name "*.a" -delete %{_libdir}/pkgconfig/winpr-tools2.pc %changelog +* Thu May 21 2020 Ondrej Holy - 2:2.1.1-1 +- Update to 2.1.1. + * Thu May 14 2020 Ondrej Holy - 2:2.1.0-1 - Update to 2.1.0 (#1833540). diff --git a/sources b/sources index 9bfb282..5b5ba78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (FreeRDP-2.1.0.tar.gz) = afed8893128067b688bf5ba87e7d28296ece3b4848d84653ab0ad0c3723b6a8bc36733aca9649fb29a0d4a53b39fdd49d56d17e9b4eac8bf7b06fa4b27e66b14 +SHA512 (FreeRDP-2.1.1.tar.gz) = e3e667f9a1f954ce914e7dcd24ba4d171fd147e812883ebcb67363dde4054e2d3cbe5fe4e7104fe52f84453c67e32281b5ee62889ba68850ba762196549855ba