diff --git a/.gitignore b/.gitignore index dff0c16..dd80894 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ rdesktop-1.6.0.tar.gz /rdesktop-1.8.3.tar.gz /rdesktop-1.8.4.tar.gz /rdesktop-1.8.6.tar.gz +/rdesktop-1.9.0.tar.gz diff --git a/rdesktop-libao.patch b/rdesktop-libao.patch deleted file mode 100644 index 1c1bb71..0000000 --- a/rdesktop-libao.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up rdesktop-1.8.0/rdpsnd_libao.c.ao rdesktop-1.8.0/rdpsnd_libao.c ---- rdesktop-1.8.0/rdpsnd_libao.c.ao 2013-06-20 14:56:16.000000000 +0200 -+++ rdesktop-1.8.0/rdpsnd_libao.c 2013-08-12 00:59:55.767287517 +0200 -@@ -77,6 +77,7 @@ libao_open(void) - format.channels = 2; - format.rate = 44100; - format.byte_format = AO_FMT_NATIVE; -+ format.matrix = NULL; - - o_device = ao_open_live(default_driver, &format, NULL); - if (o_device == NULL) -@@ -115,6 +116,7 @@ libao_set_format(RD_WAVEFORMATEX * pwfx) - format.channels = pwfx->nChannels; - format.rate = 44100; - format.byte_format = AO_FMT_NATIVE; -+ format.matrix = NULL; - - if (o_device != NULL) - ao_close(o_device); diff --git a/rdesktop.spec b/rdesktop.spec index 4402527..07ba2cc 100644 --- a/rdesktop.spec +++ b/rdesktop.spec @@ -3,7 +3,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: rdesktop -Version: 1.8.6 +Version: 1.9.0 Release: 1%{?dist} Summary: X client for remote desktop into Windows Terminal Server @@ -11,20 +11,15 @@ License: GPLv3+ URL: http://www.rdesktop.org/ #Source0: https://github.com/%%{name}/%%{name}/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/rdesktop-%{version}.tar.gz -Patch1: %{name}-libao.patch -BuildRequires: libao-devel -%if 0%{?fedora} > 19 -%global credssp --disable-credssp -%else -%global credssp --enable-credssp -BuildRequires: libgssglue-devel -%endif +BuildRequires: gnutls-devel +BuildRequires: krb5-devel +BuildRequires: libtasn1-devel BuildRequires: libX11-devel BuildRequires: libXcursor-devel BuildRequires: libXrandr-devel -BuildRequires: libsamplerate-devel -BuildRequires: openssl-devel +BuildRequires: nettle-devel BuildRequires: pcsc-lite-devel +BuildRequires: pulseaudio-libs-devel BuildRequires: autoconf automake libtool %description @@ -36,13 +31,10 @@ desktop. Unlike Citrix ICA, no server extensions are required. %prep #setup -q -n %%{name}-%%{commit} %setup -q -%patch1 -p1 -b .ao %build autoreconf -vif -%configure --with-ipv6 --enable-smartcard --with-sound=libao \ - %{?credssp} - +%configure --with-ipv6 --with-sound=pulse make %{?_smp_mflags} %install @@ -55,6 +47,11 @@ make install DESTDIR=$RPM_BUILD_ROOT STRIP=/bin/true %{_mandir}/man1/* %changelog +* Tue Nov 19 2019 Charles R. Anderson - 1.8.6-1 +- Update to 1.9.0 +- Use new PulseAudio support rather than libao +- Reenable CredSSP support now that libgssglue is no longer required + * Fri Aug 16 2019 Charles R. Anderson - 1.8.6-1 - Update to 1.8.6 release which fixes a bug in 1.8.5. - 1.8.5 is a security release to address various buffer overflow diff --git a/sources b/sources index 547b5d1..a29a5bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rdesktop-1.8.6.tar.gz) = 18b918883746c490852b97086e7727d546a0b1902a87515d6ff7b9568f30404a24934ea3ac55c9213d4db7bf5be3b47985490fa0533b15d9d6749d31c77260a6 +SHA512 (rdesktop-1.9.0.tar.gz) = e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5