[lasi] Apply patch. Set LIBDIR.
Orion Poplawski
orion at fedoraproject.org
Wed Jun 13 04:20:40 UTC 2012
commit 7e822b30f11157ffd03676861b78bd6968b25bdf
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Jun 12 22:20:35 2012 -0600
Apply patch. Set LIBDIR.
lasi-multilib.patch | 4 ++--
lasi.spec | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/lasi-multilib.patch b/lasi-multilib.patch
index 377811f..de5d4ea 100644
--- a/lasi-multilib.patch
+++ b/lasi-multilib.patch
@@ -5,8 +5,8 @@ diff -up libLASi-1.1.1/examples/Makefile.examples.in.multilib libLASi-1.1.1/exam
CXX = @CMAKE_CXX_COMPILER@
EXEEXT = @EXEEXT@
RPATHCMD = @RPATHCMD@
--PKG_ENV =
-+PKG_ENV = PKG_CONFIG_PATH=@PKG_CONFIG_PATH@
+-PKG_ENV = PKG_CONFIG_PATH=@PKG_CONFIG_PATH@
++PKG_ENV =
all: example0.ps example1.ps example2.ps
diff --git a/lasi.spec b/lasi.spec
index 9ee81b4..ee24e70 100644
--- a/lasi.spec
+++ b/lasi.spec
@@ -19,7 +19,7 @@ BuildRequires: dejavu-sans-mono-fonts
LASi is a library written by Larry Siden that provides a C++ stream output
interface ( with operator << ) for creating Postscript documents that can
contain characters from any of the scripts and symbol blocks supported in
-Unicode and by Owen Taylor's Pango layout engine. The library accomodates
+Unicode and by Owen Taylor's Pango layout engine. The library accommodates
right-to-left scripts such as Arabic and Hebrew as easily as left-to-right
scripts. Indic and Indic-derived Complex Text Layout (CTL) scripts, such as
Devanagari, Thai, Lao, and Tibetan are supported to the extent provided by
@@ -45,6 +45,7 @@ Requires: pango-devel
%prep
%setup -q -n libLASi-%{version}
+%patch0 -p1 -b .multilib
%build
@@ -53,7 +54,7 @@ cd fedora
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
export FFLAGS="$RPM_OPT_FLAGS"
-%cmake -DCMAKE_SKIP_RPATH=OFF -DUSE_RPATH=OFF ..
+%cmake -DUSE_RPATH=OFF -DLIBDIR=%{_lib} ..
make VERBOSE=1 %{?_smp_mflags}
More information about the scm-commits
mailing list