[packages/gridfields] - added config patch (sanitize `gridfields-config --libs`); release 2
qboosh
qboosh at pld-linux.org
Mon Mar 28 21:30:49 CEST 2016
commit f8adfb303f8acf455bfaefc0f99d1db9d48f7269
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Mar 28 21:30:44 2016 +0200
- added config patch (sanitize `gridfields-config --libs`); release 2
gridfields-config.patch | 25 +++++++++++++++++++++++++
gridfields.spec | 4 +++-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/gridfields.spec b/gridfields.spec
index 02c367a..4f68ea7 100644
--- a/gridfields.spec
+++ b/gridfields.spec
@@ -2,7 +2,7 @@ Summary: GridFields - convenient, algebraic manipulation of unstructured grids
Summary(pl.UTF-8): GridFields - wygodne operacje algebraiczne na tablicach bez struktury
Name: gridfields
Version: 1.0.5
-Release: 1
+Release: 2
# COPYING and most recent source files (GFError.*) say so
License: LGPL v2.1+
Group: Libraries
@@ -11,6 +11,7 @@ Group: Libraries
# for now, use hyrax-dependencies module
Source0: https://github.com/OPENDAP/hyrax-dependencies/raw/master/downloads/%{name}-%{version}.tar.gz
# Source0-md5: 54819cdeb22e894921c7e84f460ae75a
+Patch0: %{name}-config.patch
URL: https://github.com/OPENDAP/gridfields/
BuildRequires: autoconf >= 2.68
BuildRequires: automake
@@ -57,6 +58,7 @@ Statyczna biblioteka GridFields.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/gridfields-config.patch b/gridfields-config.patch
new file mode 100644
index 0000000..d1d547c
--- /dev/null
+++ b/gridfields-config.patch
@@ -0,0 +1,25 @@
+--- gridfields-1.0.5/gridfields-config.in.orig 2015-12-04 20:41:06.000000000 +0100
++++ gridfields-1.0.5/gridfields-config.in 2016-03-28 21:25:27.614407375 +0200
+@@ -4,8 +4,7 @@
+ #
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-libdir64=${exec_prefix}/lib64
++libdir=@libdir@
+ includedir=${prefix}/include
+
+ usage()
+@@ -60,7 +59,11 @@
+ ;;
+
+ --libs)
+- echo "-L${libdir64} -L${libdir} -lgridfields @LIBS@"
++ if [ "${prefix}" = "/usr" ]; then
++ echo "-lgridfields @LIBS@"
++ else
++ echo "-L${libdir} -lgridfields @LIBS@"
++ fi
+ ;;
+
+ --prefix)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gridfields.git/commitdiff/f8adfb303f8acf455bfaefc0f99d1db9d48f7269
More information about the pld-cvs-commit
mailing list