From f6871863cbb7f70ca9e67b7e9f857eb56ed46117894747bb6789587e1f8823f9 Mon Sep 17 00:00:00 2001 From: Pascal Bleser Date: Wed, 17 Nov 2010 12:07:09 +0000 Subject: [PATCH] update to 0.8.2 + many spec fixes OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=2 --- freerdp-0.8.1.tar.gz | 3 - freerdp-0.8.2.tar.bz2 | 3 + freerdp-plugin_path_placeholder.patch | 22 ++++++ freerdp.changes | 23 ++++++ freerdp.spec | 105 ++++++++++++++++++-------- 5 files changed, 120 insertions(+), 36 deletions(-) delete mode 100644 freerdp-0.8.1.tar.gz create mode 100644 freerdp-0.8.2.tar.bz2 create mode 100644 freerdp-plugin_path_placeholder.patch create mode 100644 freerdp.changes diff --git a/freerdp-0.8.1.tar.gz b/freerdp-0.8.1.tar.gz deleted file mode 100644 index 77d1d99..0000000 --- a/freerdp-0.8.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c92c5cb95c50fbc2834ceb2fecae6f7c8247d9fe34a9cf69a4ff9ee6c4567d3 -size 934809 diff --git a/freerdp-0.8.2.tar.bz2 b/freerdp-0.8.2.tar.bz2 new file mode 100644 index 0000000..16f832e --- /dev/null +++ b/freerdp-0.8.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fc98b6a811b4bc04f2c44190cc70ba4c73e593418d7f06afd47c73b17647e4e +size 732420 diff --git a/freerdp-plugin_path_placeholder.patch b/freerdp-plugin_path_placeholder.patch new file mode 100644 index 0000000..6f33c88 --- /dev/null +++ b/freerdp-plugin_path_placeholder.patch @@ -0,0 +1,22 @@ +--- configure.orig 2010-11-17 12:51:06.000000000 +0100 ++++ configure 2010-11-17 12:51:17.000000000 +0100 +@@ -11501,7 +11501,7 @@ + KEYMAP_PATH="${datadir}/freerdp/keymaps" + + +-PLUGIN_PATH='${libdir}/freerdp' ++PLUGIN_PATH='${libdir}/freerdp@@SONAME@@' + + + # +--- configure.ac.orig 2010-11-17 12:50:50.000000000 +0100 ++++ configure.ac 2010-11-17 12:51:01.000000000 +0100 +@@ -59,7 +59,7 @@ + AC_SUBST(KEYMAP_PATH) + + dnl Define plugin path +-PLUGIN_PATH='${libdir}/freerdp' ++PLUGIN_PATH='${libdir}/freerdp@@SONAME@@' + AC_SUBST(PLUGIN_PATH) + + # diff --git a/freerdp.changes b/freerdp.changes new file mode 100644 index 0000000..17d5332 --- /dev/null +++ b/freerdp.changes @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +Wed Nov 17 11:35:04 UTC 2010 - pascal.bleser@opensuse.org + +- rewrote most of the spec file (wrong group, wrong subpackages, ldconfig called on devel package, shlibs inj devel package, ...) + +- update to 0.8.2: + * libfreerdp: + + fix buffer overflow when local timezone doesn't fit in 32 bytes + + fix data corruption after TLS license package + + free TLS resources to avoid memory leaks + * mcs: + + fix connecting to VirtualBox with extra channels + * rdpsnd plugin: + + ensure the ALSA device is closed when freeing resources + * rdpdr plugin: + + fix various memory leaks + + fix a segfault in multi-session environment + +------------------------------------------------------------------- +Wed Oct 27 00:00:00 UTC 2010 - hrustov@gmail.com + +-initial build + diff --git a/freerdp.spec b/freerdp.spec index 955d3b2..59b774b 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,64 +1,103 @@ -Summary: A fork of the rdesktop project -Name: freerdp -Version: 0.8.1 -Release: 1.1 -URL: http://freerdp.sourceforge.net/ -License: GNU General Public License version 2 -Group: Applications/Internet -Source0: %{name}-%{version}.tar.gz -BuildRequires: cups-devel openssl-devel xorg-x11-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# vim: set sw=4 ts=4 et: + +Summary: Remote Desktop Viewer +Name: freerdp +Version: 0.8.2 +%define soname 0 +Release: 1 +URL: http://freerdp.sourceforge.net/ +License: GNU General Public License version 2 +Group: Productivity/Networking/Other +Source0: http://prdownloads.sourceforge.net/freerdp//freerdp-%{version}.tar.bz2 +Patch1: %{name}-plugin_path_placeholder.patch +BuildRequires: cups-devel openssl-devel xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: libfreerdp%{soname} = %{version} %description FreeRDP is a fork of the rdesktop project that intends to rapidly start moving forward and implement features that rdesktop lacks the most. +%package -n libfreerdp%{soname} +Summary: Remote Desktop Viewer Library +Group: System/Libraries +Provides: libfreerdpchanman%{soname} = %{version}-%{release} +Provides: libfreerdpgdi%{soname} = %{version}-%{release} +Provides: libfreerdpkbd%{soname} = %{version}-%{release} + +%description -n libfreerdp%{soname} +FreeRDP is a fork of the rdesktop project that intends to rapidly start +moving forward and implement features that rdesktop lacks the most. + %package devel -Summary: FreeRDP development files -Group: Development/Libraries/Other +Summary: FreeRDP development files +Group: Development/Libraries/C and C++ +Requires: libfreerdp%{soname} = %{version} %description devel This package contains %{name} development headers %prep %setup -q +%patch1 +%__perl -ne 'print $1,"\n" if /^\+{3}\s+(.+?)\s+\d/' <"%{PATCH1}" | while read f; do + %__sed -i 's|@@SONAME@@|%{soname}|g' "$f" +done +#' %build -%configure --with-ipv6 --enable-smartcard --with-sound --with-crypto=openssl --with-gnu-ld -%__make %{?_smp_mflags} +%configure \ + --with-ipv6 \ + --enable-smartcard \ + --with-sound \ + --with-crypto=openssl + +%__make %{?_smp_mflags} V=1 %install %makeinstall -%{__rm} -f %{buildroot}%{_libdir}/{%{name}/,lib}*.{a,la} +%__rm -f "%{buildroot}%{_libdir}"/{freerdp%{soname}/,lib}*.{a,la} -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig +%post -n libfreerdp%{soname} -p /sbin/ldconfig +%postun -n libfreerdp%{soname} -p /sbin/ldconfig %clean -%{__rm} -rf '%{buildroot}' +%{?buildroot:%__rm -rf "%{buildroot}"} %files %defattr(-,root,root) %doc COPYING AUTHORS doc/ipv6.txt doc/ChangeLog %{_bindir}/xfreerdp -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* -%{_mandir}/man1/xfreerdp.1.gz +%{_datadir}/%{name} +%{_mandir}/man1/xfreerdp.1%{ext_man} + +%files -n libfreerdp%{soname} +%defattr(-,root,root) +%doc COPYING +%{_libdir}/libfreerdp.so.%{soname} +%{_libdir}/libfreerdp.so.%{soname}.* +%{_libdir}/libfreerdpchanman.so.%{soname} +%{_libdir}/libfreerdpchanman.so.%{soname}.* +%{_libdir}/libfreerdpgdi.so.%{soname} +%{_libdir}/libfreerdpgdi.so.%{soname}.* +%{_libdir}/libfreerdpkbd.so.%{soname} +%{_libdir}/libfreerdpkbd.so.%{soname}.* +%dir %{_libdir}/freerdp%{soname} +%{_libdir}/freerdp%{soname}/audin.so +%{_libdir}/freerdp%{soname}/cliprdr.so +%{_libdir}/freerdp%{soname}/disk.so +%{_libdir}/freerdp%{soname}/drdynvc.so +%{_libdir}/freerdp%{soname}/parallel.so +%{_libdir}/freerdp%{soname}/pnpdr.so +%{_libdir}/freerdp%{soname}/printer.so +%{_libdir}/freerdp%{soname}/rdpdr.so +%{_libdir}/freerdp%{soname}/rdpsnd.so +%{_libdir}/freerdp%{soname}/serial.so %files devel %defattr(-,root,root) -%dir %{_prefix}/include/%{name} -%{_prefix}/include/%{name}/*.h +%{_includedir}/freerdp %{_libdir}/lib*.so -%{_libdir}/lib*.so.* -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/freerdp.pc -%changelog -* Wed Oct 27 2010 Evgeny Khrustov - 0.8.1 --initial build