From 7a834cd13beb911780a011b05fb126b2160b7c3b Mon Sep 17 00:00:00 2001 From: Mads Kiilerich Date: Sep 30 2012 21:37:56 +0000 Subject: Merge branch 'el6' into el5 Conflicts: freerdp.spec --- diff --git a/.gitignore b/.gitignore index c1104c5..a6f6e62 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /freerdp-0.8.1.tar.gz /freerdp-0.8.2.tar.gz /FreeRDP-1.0.1.tar.gz +/fastpath_send_input_pdu-sec_bytes.patch +/freerdp-1.0.1.tar.gz diff --git a/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch b/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch new file mode 100644 index 0000000..b0c7535 --- /dev/null +++ b/c10866db66c0d462ea7c2c38bb01740bcfb4fcb4.patch @@ -0,0 +1,53 @@ +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 ed7cb62..4cd9543 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -1,12 +1,19 @@ Name: freerdp Version: 1.0.1 +<<<<<<< HEAD Release: 3%{?dist} +======= +Release: 7%{?dist} +>>>>>>> el6 Summary: Remote Desktop Protocol client Group: Applications/Communications License: ASL 2.0 URL: http://www.freerdp.com/ -Source0: https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-%{version}.tar.gz +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -22,9 +29,11 @@ BuildRequires: libxkbfile-devel #BuildRequires: pulseaudio-libs-devel BuildRequires: cups-devel BuildRequires: pcsc-lite-devel +BuildRequires: desktop-file-utils Provides: xfreerdp = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release}, %{name}-plugins = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: %{name}-plugins%{?_isa} = %{version}-%{release} %description The xfreerdp Remote Desktop Protocol (RDP) client from the FreeRDP @@ -49,7 +58,7 @@ libfreerdp-core can be extended with plugins handling RDP channels. %package plugins Summary: Plugins for handling the standard RDP channels Group: Applications/Communications -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description plugins A set of plugins to the channel manager implementing the standard virtual channels extending RDP core functionality. For instance, sounds, clipboard @@ -59,7 +68,7 @@ sync, disk/printer redirection, etc. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -68,10 +77,26 @@ developing applications that use %{name}-libs. %prep -%setup -q -n FreeRDP-FreeRDP-8e62721 + +%setup -q +%patch0 -p1 +%patch1 -p1 + +cat << EOF > xfreerdp.desktop +[Desktop Entry] +Type=Application +Name=X FreeRDP +NoDisplay=true +Comment=Connect to RDP server and display remote desktop +Icon=%{name} +Exec=/usr/bin/xfreerdp +Terminal=false +Categories=Network;RemoteAccess; +EOF %build + %cmake \ -DWITH_CUPS=ON \ -DWITH_PCSC=ON \ @@ -90,21 +115,30 @@ developing applications that use %{name}-libs. -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ . - make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT + make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' + # No need for keymap files when using xkbfile 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 + %clean rm -rf $RPM_BUILD_ROOT +%post +# This is no gtk application, but try to integrate nicely with GNOME if it is available +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %post libs -p /sbin/ldconfig @@ -115,6 +149,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %{_bindir}/xfreerdp %{_mandir}/man1/xfreerdp.* +%{_datadir}/applications/xfreerdp.desktop +%{_datadir}/icons/hicolor/256x256/apps/%{name}.png %files libs %defattr(-,root,root,-) @@ -134,6 +170,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 30 2012 Mads Kiilerich - 1.0.1-7 +- backport / merge from el6 + * Mon Feb 27 2012 Mads Kiilerich - 1.0.1-3 - EL5: Disable pulseaudio - the version in EL5 is too old diff --git a/sources b/sources index b48d0d5..889010f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1282189a87893bf196da20382e45f6c1 FreeRDP-1.0.1.tar.gz +c843185e0ff22ce8409954651718f338 freerdp-1.0.1.tar.gz +e4f49159bfb94ea534a8d14a2a5b5067 fastpath_send_input_pdu-sec_bytes.patch