[lasi] Fix multilib conflict (Bug 831398)
Orion Poplawski
orion at fedoraproject.org
Wed Jun 13 03:38:45 UTC 2012
commit e6c5aaa1047898bf36cdbd0ae0f2d1ddd801603b
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Tue Jun 12 21:38:42 2012 -0600
Fix multilib conflict (Bug 831398)
lasi-multilib.patch | 12 ++++++++++++
lasi.spec | 6 +++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/lasi-multilib.patch b/lasi-multilib.patch
new file mode 100644
index 0000000..377811f
--- /dev/null
+++ b/lasi-multilib.patch
@@ -0,0 +1,12 @@
+diff -up libLASi-1.1.1/examples/Makefile.examples.in.multilib libLASi-1.1.1/examples/Makefile.examples.in
+--- libLASi-1.1.1/examples/Makefile.examples.in.multilib 2012-06-12 21:36:04.797674580 -0600
++++ libLASi-1.1.1/examples/Makefile.examples.in 2011-09-21 13:09:55.000000000 -0600
+@@ -1,7 +1,7 @@
+ CXX = @CMAKE_CXX_COMPILER@
+ EXEEXT = @EXEEXT@
+ RPATHCMD = @RPATHCMD@
+-PKG_ENV =
++PKG_ENV = PKG_CONFIG_PATH=@PKG_CONFIG_PATH@
+
+ all: example0.ps example1.ps example2.ps
+
diff --git a/lasi.spec b/lasi.spec
index e2b2d3c..9ee81b4 100644
--- a/lasi.spec
+++ b/lasi.spec
@@ -1,12 +1,13 @@
Name: lasi
Version: 1.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: C++ library for creating Postscript documents
Group: Development/Libraries
License: LGPLv2+
URL: http://www.unifont.org/lasi/
Source0: http://downloads.sourceforge.net/lasi/libLASi-%{version}.tar.gz
+Patch0: lasi-multilib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pango-devel, cmake
@@ -92,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jun 12 2012 Orion Poplawski <orion at cora.nwra.com> - 1.1.1-4
+- Fix multilib conflict (Bug 831398)
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-3
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list