[remmina] Fix DSO linking against gnutls (#819976)

Christoph Wickert cwickert at fedoraproject.org
Sat Jun 9 16:41:07 UTC 2012


commit 48973fa57e04f28db7b3dc3f9a9def9ac32485d2
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Sat Jun 9 18:38:57 2012 +0200

    Fix DSO linking against gnutls (#819976)

 remmina-1.0.0-dsofix.patch |   11 +++++++++++
 remmina.spec               |   14 +++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)
---
diff --git a/remmina-1.0.0-dsofix.patch b/remmina-1.0.0-dsofix.patch
new file mode 100644
index 0000000..2778e0d
--- /dev/null
+++ b/remmina-1.0.0-dsofix.patch
@@ -0,0 +1,11 @@
+--- remmina-plugins/vnc/CMakeLists.txt	2012-06-04 13:03:46.542093149 -0600
++++ remmina-plugins/vnc/CMakeLists.txt	2012-06-04 13:03:34.112332497 -0600
+@@ -28,7 +28,7 @@ 
+ set_target_properties(remmina-plugin-vnc PROPERTIES PREFIX "")
+ 
+ include_directories(${REMMINA_COMMON_INCLUDE_DIRS} ${LIBVNCSERVER_INCLUDE_DIRS})
+-target_link_libraries(remmina-plugin-vnc ${REMMINA_COMMON_LIBRARIES} ${LIBVNCSERVER_LIBRARIES})
++target_link_libraries(remmina-plugin-vnc ${REMMINA_COMMON_LIBRARIES} ${LIBVNCSERVER_LIBRARIES} gnutls )
+ 
+ install(TARGETS remmina-plugin-vnc DESTINATION ${REMMINA_PLUGINDIR})
+ 
diff --git a/remmina.spec b/remmina.spec
index b66609f..74e7f53 100644
--- a/remmina.spec
+++ b/remmina.spec
@@ -2,7 +2,7 @@
 
 Name:           remmina
 Version:        1.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Remote Desktop Client
 
 Group:          Applications/Internet
@@ -32,6 +32,9 @@ Patch10:        remmina-1.0.0-fix-crashes-in-some-cases.patch
 # https://github.com/FreeRDP/Remmina/commit/b2277827
 Patch11:        remmina-1.0.0-fix-memory-leak.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=819976
+Patch20:        remmina-1.0.0-dsofix.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk3-devel
@@ -200,8 +203,10 @@ client.
 %patch4 -p1 -b .some-more-clipboard-fixes
 %patch5 -p1 -b .disconnect-signal-handler
 
-%patch10  -p1 -b .fix-crashes-in-some-cases
-%patch11  -p1 -b .fix-memory-leak
+%patch10 -p1 -b .fix-crashes-in-some-cases
+%patch11 -p1 -b .fix-memory-leak
+
+%patch20 -p1 -b .dsofix
 
 # Don't hardcode libdir
 sed -i "s,/lib/remmina/plugins,/%{_lib}/remmina/plugins,g" CMakeLists.txt
@@ -333,6 +338,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jun 09 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-4
+- Fix DSO linking against gnutls (#819976)
+
 * Sun Jun 03 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.0.0-3
 - Fix crash introduced by clipboard support (#827756)
 


More information about the scm-commits mailing list