diff --git a/.gitignore b/.gitignore index ecd2e48..6e7669f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ocaml-mysql-1.0.4.tar.gz /ocaml-mysql-1.1.0.tar.gz /ocaml-mysql-1.1.1.tar.gz /ocaml-mysql-1.1.2.tar.gz +/ocaml-mysql-1.1.3.tar.gz diff --git a/ocaml-mysql-1.1.3-int64.patch b/ocaml-mysql-1.1.3-int64.patch new file mode 100644 index 0000000..9ea6d20 --- /dev/null +++ b/ocaml-mysql-1.1.3-int64.patch @@ -0,0 +1,35 @@ +--- ocaml-mysql-1.1.3.old/mysql_stubs.c 2014-10-16 16:35:05.000000000 +0100 ++++ ocaml-mysql-1.1.3/mysql_stubs.c 2014-11-03 13:12:11.562441200 +0000 +@@ -508,14 +508,14 @@ + + EXTERNAL value + db_to_row(value result, value offset) { +- int64 off = Int64_val(offset); ++ int64_t off = Int64_val(offset); + MYSQL_RES *res; + + res = RESval(result); + if (!res) + mysqlfailwith("Mysql.to_row: result did not return fetchable data"); + +- if (off < 0 || off > (int64)mysql_num_rows(res)-1) ++ if (off < 0 || off > (int64_t)mysql_num_rows(res)-1) + invalid_argument("Mysql.to_row: offset out of range"); + + mysql_data_seek(res, off); +@@ -640,13 +640,13 @@ + { + CAMLparam1(result); + MYSQL_RES *res; +- int64 size; ++ int64_t size; + + res = RESval(result); + if (!res) + size = 0; + else +- size = (int64)(mysql_num_rows(res)); ++ size = (int64_t)(mysql_num_rows(res)); + + CAMLreturn(copy_int64(size)); + } diff --git a/ocaml-mysql-paths.patch b/ocaml-mysql-paths.patch deleted file mode 100644 index 979cbdb..0000000 --- a/ocaml-mysql-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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 bbce416..fa87211 100644 --- a/ocaml-mysql.spec +++ b/ocaml-mysql.spec @@ -1,13 +1,16 @@ %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-mysql -Version: 1.1.2 -Release: 7%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: OCaml library for accessing MySQL databases License: LGPLv2+ with exceptions URL: http://forge.ocamlcore.org/projects/ocaml-mysql/ -Source0: https://forge.ocamlcore.org/frs/download.php/1308/ocaml-mysql-%{version}.tar.gz +Source0: https://forge.ocamlcore.org/frs/download.php/1472/%{name}-%{version}.tar.gz + +# int64 removed from OCaml header files, use standard int64_t instead. +Patch1: ocaml-mysql-1.1.3-int64.patch ExcludeArch: sparc64 s390 s390x @@ -15,12 +18,9 @@ BuildRequires: ocaml >= 3.10.0 BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-camlp4-devel -BuildRequires: mysql-devel +BuildRequires: mariadb-devel BuildRequires: chrpath -# 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 +40,12 @@ developing applications that use %{name}. %prep %setup -q + %patch1 -p1 %build +LDFLAGS="-L%{_libdir}/mysql" \ %configure make %if %opt @@ -84,8 +86,10 @@ make install %changelog -* Mon Nov 03 2014 Richard W.M. Jones - 1.1.2-7 -- Bump and rebuild. +* Mon Nov 03 2014 Richard W.M. Jones - 1.1.3-1 +- New upstream version 1.1.3. +- Remove paths patch, which seems unneeded now. +- mysql-devel -> mariadb-devel * Sun Aug 31 2014 Richard W.M. Jones - 1.1.2-6 - Bump release and rebuild. diff --git a/sources b/sources index 755bac9..2c23067 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a5842c82110a65cc37f6fce460ada07 ocaml-mysql-1.1.2.tar.gz +29952f3fd5fcb2aa1edc789de61e1b76 ocaml-mysql-1.1.3.tar.gz