[krfb/f19] use system minilzo (instead of bundled copy)

[Rex Dieter]

commit a95778fc49b4b11856fd5098a71a720615ec2e16
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Aug 4 12:33:13 2014 -0500

    use system minilzo (instead of bundled copy)

 krfb-system_minilzo.patch |   28 ++++++++++++++++++++++++++++
 krfb.spec                 |   10 +++++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/krfb-system_minilzo.patch b/krfb-system_minilzo.patch
new file mode 100644
index 0000000..d0a4d3c
--- /dev/null
+++ b/krfb-system_minilzo.patch
@@ -0,0 +1,28 @@
+diff -up krfb-4.11.5/libvncserver/CMakeLists.txt.system_minilzo krfb-4.11.5/libvncserver/CMakeLists.txt
+--- krfb-4.11.5/libvncserver/CMakeLists.txt.system_minilzo	2014-01-02 13:38:14.000000000 -0600
++++ krfb-4.11.5/libvncserver/CMakeLists.txt	2014-08-04 12:15:30.148919143 -0500
+@@ -92,7 +92,6 @@ set(LIBVNCSERVER_SOURCES
+     d3des.c
+     vncauth.c
+     cargs.c
+-    minilzo.c
+     ultra.c
+     scale.c
+ )
+@@ -118,6 +117,10 @@ if(JPEG_FOUND)
+   )
+ endif(JPEG_FOUND)
+ 
++#if(MINOLZO_FOUND)
++  include_directories(/usr/include/lzo)
++  set(MINILZO_LIBRARIES -lminilzo)
++#endif
+ 
+ add_library(vncserver STATIC ${LIBVNCSERVER_SOURCES})
+ 
+@@ -129,4 +132,5 @@ target_link_libraries(vncserver
+     ${ADDITIONAL_LIBS}
+     ${ZLIB_LIBRARIES}
+     ${JPEG_LIBRARIES}
++    ${MINILZO_LIBRARIES}
+ )
diff --git a/krfb.spec b/krfb.spec
index 26504b7..b97cb73 100644
--- a/krfb.spec
+++ b/krfb.spec
@@ -2,7 +2,7 @@
 Name:    krfb
 Summary: Desktop sharing
 Version: 4.11.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+ and GFDL
 URL:     https://projects.kde.org/projects/kde/kdenetwork/%{name}
@@ -17,10 +17,13 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 # http://www.kde.org/info/security/advisory-20140803-1.txt
 # update bundled liblzo
 Patch101: krfb-CVE-2014-4607.patch
+# use system libminilzo
+Patch102: krfb-system_minilzo.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: libjpeg-devel
+BuildRequires: lzo-devel lzo-minilzo
 %if 0%{?fedora}
 %global telepathy 1
 BuildRequires: pkgconfig(TelepathyQt4)
@@ -52,6 +55,8 @@ Provides:  kdenetwork-krfb-libs = 7:%{version}-%{release}
 %setup -q
 
 %patch101 -p1 -b .CVE-2014-4607
+%patch102 -p1 -b .system_minilzo
+rm -fv libvncserver/{lzodefs,lzoconf,minilzo}*
 
 
 %build
@@ -107,6 +112,9 @@ fi
 
 
 %changelog
+* Mon Aug 04 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.5-3
+- use system minilzo (instead of bundled copy)
+
 * Sun Aug 03 2014 Rex Dieter <rdieter at fedoraproject.org> 4.11.5-2
 - update bundled libvncserver/liblzo (CVE-2014-4607)