[libwapcaplet] fix libwapcaplet.pc

[David Tardon]

commit bed523774f572563528b0d08f0e120c2701ac311
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 13 09:43:13 2014 +0100

    fix libwapcaplet.pc

 0001-add-support-for-multilib.patch |   38 +++++++++++++++++++++++++++++++++++
 libwapcaplet.spec                   |   13 ++++++++---
 2 files changed, 47 insertions(+), 4 deletions(-)
---
diff --git a/0001-add-support-for-multilib.patch b/0001-add-support-for-multilib.patch
new file mode 100644
index 0000000..c528e77
--- /dev/null
+++ b/0001-add-support-for-multilib.patch
@@ -0,0 +1,38 @@
+From 07bb9c7a28259d0ae456056583f123d85819d1b4 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 12 Jan 2014 09:22:05 +0100
+Subject: [PATCH] add support for multilib
+
+Signed-off-by: John-Mark Bell <jmb at netsurf-browser.org>
+---
+ Makefile           | 4 ++--
+ libwapcaplet.pc.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8df0136..4c125c3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,5 +43,5 @@ endif
+ # Extra installation rules
+ I := /include/libwapcaplet
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libwapcaplet/libwapcaplet.h
+-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in
+-INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT)
++INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
++INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libwapcaplet.pc.in b/libwapcaplet.pc.in
+index 1517494..9bdfdf5 100644
+--- a/libwapcaplet.pc.in
++++ b/libwapcaplet.pc.in
+@@ -1,6 +1,6 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/LIBDIR
+ includedir=${prefix}/include
+ 
+ Name: libwapcaplet
+-- 
+1.8.4.2
+
diff --git a/libwapcaplet.spec b/libwapcaplet.spec
index 7dc8d54..9fd04e5 100644
--- a/libwapcaplet.spec
+++ b/libwapcaplet.spec
@@ -1,6 +1,6 @@
 Name: libwapcaplet
 Version: 0.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A string internment library
 
 Group: System Environment/Libraries
@@ -11,6 +11,8 @@ Source: http://download.netsurf-browser.org/libs/releases/%{name}-%{version}-src
 BuildRequires: check-devel
 BuildRequires: netsurf-buildsystem
 
+Patch0: 0001-add-support-for-multilib.patch
+
 %description
 LibWapcaplet is a string internment library, written in C. It provides
 reference counted string interment and rapid string comparison
@@ -27,12 +29,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-%global make_vars COMPONENT_TYPE=lib-shared PREFIX=%{_prefix} Q=
+%global make_vars COMPONENT_TYPE=lib-shared PREFIX=%{_prefix} LIBDIR=%{_lib} Q=
 %global build_vars OPTCFLAGS='%{optflags}' OPTLDFLAGS="$RPM_LD_FLAGS"
+
 %prep
 %setup -q -n %{name}-%{version}
-
-sed -i -e s@/lib/@/%{_lib}/@ -e s@/lib:@/%{_lib}:@ Makefile %{name}.pc.in
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} %{make_vars} %{build_vars}
@@ -56,6 +58,9 @@ make %{?_smp_mflags} test %{make_vars}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Jan 13 2014 David Tardon <dtardon at redhat.com> - 0.2.0-3
+- fix libwapcaplet.pc
+
 * Tue Jan 07 2014 David Tardon <dtardon at redhat.com> - 0.2.0-2
 - build with correct flags