[purple-msn-pecan] Really link against system libmspack.

[Jussi Lehtola]

commit 52e35cd39b488accd07c91abd79cb3d984999300
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sun Dec 4 22:22:36 2011 +0200

    Really link against system libmspack.

 purple-msn-pecan-0.1.3-mspack.patch |   39 +++++++++++++++++++++++++++++++++++
 purple-msn-pecan.spec               |   17 ++++++++++++--
 2 files changed, 53 insertions(+), 3 deletions(-)
---
diff --git a/purple-msn-pecan-0.1.3-mspack.patch b/purple-msn-pecan-0.1.3-mspack.patch
new file mode 100644
index 0000000..7996d57
--- /dev/null
+++ b/purple-msn-pecan-0.1.3-mspack.patch
@@ -0,0 +1,39 @@
+diff -up msn-pecan-0.1.3/Makefile.mspack msn-pecan-0.1.3/Makefile
+--- msn-pecan-0.1.3/Makefile.mspack	2011-07-30 14:03:18.000000000 +0300
++++ msn-pecan-0.1.3/Makefile	2011-12-04 22:18:14.070722197 +0200
+@@ -64,7 +64,7 @@ endif
+ 
+ ifdef LIBMSPACK
+   override CFLAGS += -DPECAN_LIBMSPACK
+-  LIBMSPACK_LIBS := -lm
++  LIBMSPACK_LIBS := -lmspack -lm
+ endif
+ 
+ ifdef PLUS_SOUNDS
+@@ -135,14 +135,6 @@ ifdef LIBSIREN
+ 	     pn_siren7.o
+ endif
+ 
+-ifdef LIBMSPACK
+-  objects += ext/libmspack/cabd.o \
+-	     ext/libmspack/mszipd.o \
+-	     ext/libmspack/lzxd.o \
+-	     ext/libmspack/qtmd.o \
+-	     ext/libmspack/system.o
+-endif
+-
+ sources := $(objects:.o=.c)
+ deps := $(objects:.o=.d)
+ 
+diff -up msn-pecan-0.1.3/switchboard.c.mspack msn-pecan-0.1.3/switchboard.c
+--- msn-pecan-0.1.3/switchboard.c.mspack	2011-07-30 14:03:18.000000000 +0300
++++ msn-pecan-0.1.3/switchboard.c	2011-12-04 22:19:25.692707845 +0200
+@@ -36,7 +36,7 @@
+ #endif /* defined(PECAN_LIBSIREN) */
+ 
+ #if defined(PECAN_LIBMSPACK)
+-#include "ext/libmspack/mspack.h"
++#include <mspack.h>
+ #include "ext/swfobject.h"
+ #include <glib/gprintf.h>
+ #endif /* defined(PECAN_LIBMSPACK) */
diff --git a/purple-msn-pecan.spec b/purple-msn-pecan.spec
index 0a07928..fdc1543 100644
--- a/purple-msn-pecan.spec
+++ b/purple-msn-pecan.spec
@@ -2,12 +2,15 @@
 
 Name:		purple-%{realname}
 Version:	0.1.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Alternative MSN protocol plug-in for lib-purple 
 Group:		Applications/Internet 
 License:	GPLv2+
 URL:		http://code.google.com/p/msn-pecan/ 
 Source0:	http://msn-pecan.googlecode.com/files/%{realname}-%{version}.tar.bz2
+# Use system version of mspack
+Patch0:		purple-msn-pecan-0.1.3-mspack.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	libpurple-devel
@@ -39,15 +42,20 @@ Other features:
 
 %prep
 %setup -q -n %{realname}-%{version}
+%patch0 -p1 -b .mspack
+
+# Get rid of bundled mspack
+rm -rf ext/libmspack
+
 
 %build
 #make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes
-make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes LIBMSPACK="" Q="" 
+make CFLAGS="%{optflags}" %{?_smp_mflags} V=yes
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -Dp -m 755 libmsn-pecan.so $RPM_BUILD_ROOT/%{_libdir}/purple-2/libmsn-pecan.so
-make install_locales DESTDIR=$RPM_BUILD_ROOT Q=""
+make install_locales DESTDIR=$RPM_BUILD_ROOT
 %find_lang libmsn-pecan 
 
 %check
@@ -64,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/purple-2/libmsn-pecan.so
 
 %changelog
+* Sun Dec  4 2011 Jussi Lehtola <jusslehtola at fedoraproject.org> - 0.1.3-3
+- Really compile against system mspack.
+
 * Sun Dec  4 2011 Edouard Bourguignon <madko at linuxed.net> - 0.1.3-2
 - compile against system lib mspack