Merge branch 'pr11'

.gitignore

@@ -44,3 +44,5 @@
 /FreeRDP-b907324.tar.gz
 /FreeRDP-6015229.tar.gz
 /FreeRDP-245fc60.tar.gz
+/FreeRDP-2.1.0.tar.gz
+/FreeRDP-2.1.1.tar.gz

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:        57.%{date}git%{shortcommit0}%{?dist}
+Version:        2.1.1
+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++
@@ -69,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)
@@ -146,7 +143,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 +294,13 @@ find %{buildroot} -name "*.a" -delete
 %{_libdir}/pkgconfig/winpr-tools2.pc
 
 %changelog
+<<<<<<< HEAD
+* Thu May 21 2020 Ondrej Holy <oholy@redhat.com> - 2:2.1.1-1
+- Update to 2.1.1.
+
+* Fri May 15 2020 Ondrej Holy <oholy@redhat.com> - 2:2.1.0-1
+- Update to 2.1.0 (#1833540).
+
 * Fri May 15 2020 Pete Walter <pwalter@fedoraproject.org> - 2:2.0.0-57.20200207git245fc60
 - Rebuild for ICU 67
 

sources

@@ -1 +1 @@
-SHA512 (FreeRDP-245fc60.tar.gz) = d6de9d229bcbe150fa65e27dfa86884bde2c88378daed4876f0c7db3af502ae31a021b89439a640353c8c6918cf26f89a472ab0a02b72c83a4063769850ca47e
+SHA512 (FreeRDP-2.1.1.tar.gz) = e3e667f9a1f954ce914e7dcd24ba4d171fd147e812883ebcb67363dde4054e2d3cbe5fe4e7104fe52f84453c67e32281b5ee62889ba68850ba762196549855ba