diff --git a/.gitignore b/.gitignore index a6f6e62..5e8a138 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /FreeRDP-1.0.1.tar.gz /fastpath_send_input_pdu-sec_bytes.patch /freerdp-1.0.1.tar.gz +/freerdp-1.0.2.tar.gz diff --git a/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch b/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch deleted file mode 100644 index b0c7535..0000000 --- a/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c10866db66c0d462ea7c2c38bb01740bcfb4fcb4 Mon Sep 17 00:00:00 2001 -From: Slava Dubrovskiy -Date: Tue, 14 Feb 2012 13:44:00 -0500 -Subject: [PATCH] Fix not linked with libpulse (issue 418) - -Signed-off-by: Slava Dubrovskiy ---- - channels/drdynvc/audin/pulse/CMakeLists.txt | 2 +- - channels/drdynvc/tsmf/pulse/CMakeLists.txt | 2 +- - channels/rdpsnd/pulse/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/channels/drdynvc/audin/pulse/CMakeLists.txt b/channels/drdynvc/audin/pulse/CMakeLists.txt -index 10d6afe..fd6e25e 100644 ---- a/channels/drdynvc/audin/pulse/CMakeLists.txt -+++ b/channels/drdynvc/audin/pulse/CMakeLists.txt -@@ -28,7 +28,7 @@ add_library(audin_pulse ${AUDIN_PULSE_SRCS}) - set_target_properties(audin_pulse PROPERTIES PREFIX "") - - target_link_libraries(audin_pulse freerdp-utils) --target_link_libraries(audin_pulse ${PULSE_LIBRARIES}) -+target_link_libraries(audin_pulse ${PULSEAUDIO_LIBRARY}) - - install(TARGETS audin_pulse DESTINATION ${FREERDP_PLUGIN_PATH}) - -diff --git a/channels/drdynvc/tsmf/pulse/CMakeLists.txt b/channels/drdynvc/tsmf/pulse/CMakeLists.txt -index 373d4d3..144b5ff 100644 ---- a/channels/drdynvc/tsmf/pulse/CMakeLists.txt -+++ b/channels/drdynvc/tsmf/pulse/CMakeLists.txt -@@ -28,7 +28,7 @@ add_library(tsmf_pulse ${TSMF_PULSE_SRCS}) - set_target_properties(tsmf_pulse PROPERTIES PREFIX "") - - target_link_libraries(tsmf_pulse freerdp-utils) --target_link_libraries(tsmf_pulse ${PULSE_LIBRARIES}) -+target_link_libraries(tsmf_pulse ${PULSEAUDIO_LIBRARY}) - - install(TARGETS tsmf_pulse DESTINATION ${FREERDP_PLUGIN_PATH}) - -diff --git a/channels/rdpsnd/pulse/CMakeLists.txt b/channels/rdpsnd/pulse/CMakeLists.txt -index 4460daf..bac3e51 100644 ---- a/channels/rdpsnd/pulse/CMakeLists.txt -+++ b/channels/rdpsnd/pulse/CMakeLists.txt -@@ -28,6 +28,6 @@ add_library(rdpsnd_pulse ${RDPSND_PULSE_SRCS}) - set_target_properties(rdpsnd_pulse PROPERTIES PREFIX "") - - target_link_libraries(rdpsnd_pulse freerdp-utils) --target_link_libraries(rdpsnd_pulse ${PULSE_LIBRARIES}) -+target_link_libraries(rdpsnd_pulse ${PULSEAUDIO_LIBRARY}) - - install(TARGETS rdpsnd_pulse DESTINATION ${FREERDP_PLUGIN_PATH}) --- -1.7.10 - diff --git a/freerdp.spec b/freerdp.spec index d3140da..adcf0e3 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,15 +1,12 @@ Name: freerdp -Version: 1.0.1 -Release: 7%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Remote Desktop Protocol client Group: Applications/Communications License: ASL 2.0 URL: http://www.freerdp.com/ -Source0: https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz -# https://github.com/FreeRDP/FreeRDP/commit/165d39a290a109c0af16a1d223d1426cb524a844 backport -Patch0: fastpath_send_input_pdu-sec_bytes.patch -Patch1: c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch +Source0: http://pub.freerdp.com/releases/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -75,8 +72,6 @@ developing applications that use %{name}-libs. %prep %setup -q -%patch0 -p1 -%patch1 -p1 cat << EOF > xfreerdp.desktop [Desktop Entry] @@ -123,7 +118,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm -rf $RPM_BUILD_ROOT/usr/share/freerdp desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications xfreerdp.desktop -install -p -D resources/FreeRDP_Icon_256px.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png +install -p -m 644 -D resources/FreeRDP_Icon_256px.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/256x256/apps/%{name}.png %clean @@ -166,6 +161,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon Sep 09 2013 Mads Kiilerich - 1.0.2-1 +- freerdp 1.0.2 + * Sun Sep 30 2012 Mads Kiilerich - 1.0.1-7 - merge f17 1.0.1-6 - Backport fix for bug 816692 diff --git a/sources b/sources index 889010f..99eec1d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c843185e0ff22ce8409954651718f338 freerdp-1.0.1.tar.gz -e4f49159bfb94ea534a8d14a2a5b5067 fastpath_send_input_pdu-sec_bytes.patch +08f0e07d8d77e142f7dc39e4033a458d freerdp-1.0.2.tar.gz