[ocaml-mysql/f18] Ensure we link to mysql client shared library (RHBZ#916822, thanks Sato Ichi).
Richard W.M. Jones
rjones at fedoraproject.org
Fri Mar 1 14:32:00 UTC 2013
commit 13f9d5acb0238b9ee78e4000adde66b6fa68cebf
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Fri Mar 1 14:18:26 2013 +0000
Ensure we link to mysql client shared library (RHBZ#916822, thanks Sato Ichi).
- Move configure into build section, and replace with RPM macro.
(cherry picked from commit 5f7459647effdd7b46084dc26ca31c63cd2218a1)
ocaml-mysql-paths.patch | 14 ++++++++++++++
ocaml-mysql.spec | 12 ++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/ocaml-mysql-paths.patch b/ocaml-mysql-paths.patch
new file mode 100644
index 0000000..979cbdb
--- /dev/null
+++ b/ocaml-mysql-paths.patch
@@ -0,0 +1,14 @@
+--- ocaml-mysql-1.1.1/configure 2012-05-19 14:13:37.000000000 -0400
++++ ocaml-mysql-1.1.1/configure 2013-02-22 15:06:20.139917364 -0500
+@@ -3470,9 +3470,9 @@
+ /usr/local/lib
+ /usr/lib
+ /usr/lib/mysql
+- /sw/lib/mysql"
++ /usr/lib64/mysql"
+ for d in $dirs; do
+- test -f "$d/libmysqlclient.a" && LDFLAGS="-L$d"
++ test -f "$d/libmysqlclient.so" && LDFLAGS="-L$d"
+ done
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking in more locations..." >&5
+ $as_echo "$as_me: checking in more locations..." >&6;}
diff --git a/ocaml-mysql.spec b/ocaml-mysql.spec
index 2aa1662..f20542f 100644
--- a/ocaml-mysql.spec
+++ b/ocaml-mysql.spec
@@ -3,7 +3,7 @@
Name: ocaml-mysql
Version: 1.1.1
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: OCaml library for accessing MySQL databases
License: LGPLv2+ with exceptions
@@ -21,6 +21,9 @@ BuildRequires: chrpath
Requires: mysql-libs
+# See: https://bugzilla.redhat.com/show_bug.cgi?id=916822
+Patch1: ocaml-mysql-paths.patch
+
%description
ocaml-mysql is a package for ocaml that provides access to mysql
@@ -40,10 +43,11 @@ developing applications that use %{name}.
%prep
%setup -q
-./configure --libdir=%{_libdir}
+%patch1 -p1
%build
+%configure
make
%if %opt
make opt
@@ -84,6 +88,10 @@ make install
%changelog
+* Fri Mar 1 2013 Richard W.M. Jones <rjones at redhat.com> - 1.1.1-3
+- Ensure we link to mysql client shared library (RHBZ#916822, thanks Sato Ichi).
+- Move configure into build section, and replace with RPM macro.
+
* Tue Oct 30 2012 Richard W.M. Jones <rjones at redhat.com> - 1.1.1-1
- New upstream version 1.1.1.
- Clean up the spec file.
More information about the scm-commits
mailing list