[libcss] fix libcss.pc

[David Tardon]

commit 21f8ed2ab8ae240ea164b5e94c90bb0afe9b6ca0
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jan 13 09:39:48 2014 +0100

    fix libcss.pc

 0001-add-support-for-multilib.patch |   38 +++++++++++++++++++++++++++++++++++
 libcss.spec                         |   11 ++++++---
 2 files changed, 45 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..1a0c3b4
--- /dev/null
+++ b/0001-add-support-for-multilib.patch
@@ -0,0 +1,38 @@
+From 7d818fad7c441dbb793a9585243e580f6bbc61ca Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Sun, 12 Jan 2014 09:21:37 +0100
+Subject: [PATCH] add support for multilib
+
+Signed-off-by: John-Mark Bell <jmb at netsurf-browser.org>
+---
+ Makefile     | 4 ++--
+ libcss.pc.in | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 68ec9ba..cacece7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -57,5 +57,5 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/properties.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/select.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/stylesheet.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/types.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/libcss.pc.in b/libcss.pc.in
+index 46155a8..695aa76 100644
+--- a/libcss.pc.in
++++ b/libcss.pc.in
+@@ -1,6 +1,6 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/LIBDIR
+ includedir=${prefix}/include
+ 
+ Name: libcss
+-- 
+1.8.4.2
+
diff --git a/libcss.spec b/libcss.spec
index 4e13b76..99027d1 100644
--- a/libcss.spec
+++ b/libcss.spec
@@ -1,6 +1,6 @@
 Name: libcss
 Version: 0.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A CSS parser and selection engine
 
 Group: System Environment/Libraries
@@ -14,6 +14,7 @@ BuildRequires: libwapcaplet-devel
 BuildRequires: netsurf-buildsystem
 
 Patch0: 0001-print-size_t-values-in-a-portable-way.patch
+Patch1: 0001-add-support-for-multilib.patch
 
 %description
 LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,
@@ -36,14 +37,13 @@ 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}
 %patch0 -p1
-
-sed -i -e s@/lib/@/%{_lib}/@ -e s@/lib:@/%{_lib}:@ Makefile %{name}.pc.in
+%patch1 -p1
 
 %build
 make %{?_smp_mflags} %{make_vars} %{build_vars}
@@ -68,6 +68,9 @@ make %{?_smp_mflags} test %{make_vars} %{build_vars}
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Jan 13 2014 David Tardon <dtardon at redhat.com> - 0.2.0-3
+- fix libcss.pc
+
 * Wed Jan 08 2014 David Tardon <dtardon at redhat.com> - 0.2.0-2
 - build with correct flags