[ocaml-sqlite] New upstream version 1.6.3.
Richard W.M. Jones
rjones at fedoraproject.org
Tue Jul 3 14:46:40 UTC 2012
commit 436c6b25a3175837b868c6d9eddbc091c3aa9b81
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Tue Jul 3 15:43:08 2012 +0100
New upstream version 1.6.3.
- Add a patch to disable all use of -warn-error.
- Change download URLs.
.gitignore | 1 +
ocaml-sqlite-1.6.3-no-warn-error.patch | 34 ++++++++++++++++++++++++++++++++
ocaml-sqlite.spec | 17 +++++++++++----
sources | 2 +-
4 files changed, 48 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d79920..3ac9e6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
release-1.5.6.tar.bz2
/release-1.5.9.tar.bz2
/release-1.6.1.tar.bz2
+/sqlite3-ocaml-1.6.3.tar.gz
diff --git a/ocaml-sqlite-1.6.3-no-warn-error.patch b/ocaml-sqlite-1.6.3-no-warn-error.patch
new file mode 100644
index 0000000..3ce3bf3
--- /dev/null
+++ b/ocaml-sqlite-1.6.3-no-warn-error.patch
@@ -0,0 +1,34 @@
+Binary files sqlite3-ocaml-1.6.3.old/libsqlite3_stubs.a and sqlite3-ocaml-1.6.3/libsqlite3_stubs.a differ
+diff -ur sqlite3-ocaml-1.6.3.old/Makefile.in sqlite3-ocaml-1.6.3/Makefile.in
+--- sqlite3-ocaml-1.6.3.old/Makefile.in 2012-07-03 15:43:15.154588530 +0100
++++ sqlite3-ocaml-1.6.3/Makefile.in 2012-07-03 15:44:22.586783411 +0100
+@@ -69,9 +69,9 @@
+ .SUFFIXES: .ml .mli .cmo .cmi .cmx
+
+ .mli.cmi:
+- ocamlc -w A -warn-error A $(OCFLAGS) -c $<
++ ocamlc -w A $(OCFLAGS) -c $<
+ .ml.cmo:
+- ocamlc -w A -warn-error A $(OCFLAGS) -c $<
++ ocamlc -w A $(OCFLAGS) -c $<
+ .ml.cmx:
+- ocamlc -w A -warn-error A $(OCFLAGS) -c $*.mli
+- ocamlopt -w A -warn-error A -inline 20 $(OCFLAGS) -c $<
++ ocamlc -w A $(OCFLAGS) -c $*.mli
++ ocamlopt -w A -inline 20 $(OCFLAGS) -c $<
+diff -ur sqlite3-ocaml-1.6.3.old/test/Makefile sqlite3-ocaml-1.6.3/test/Makefile
+--- sqlite3-ocaml-1.6.3.old/test/Makefile 2012-05-20 03:01:44.000000000 +0100
++++ sqlite3-ocaml-1.6.3/test/Makefile 2012-07-03 15:44:05.145474147 +0100
+@@ -8,10 +8,10 @@
+ opt: $(TESTS:%.ml=%.exe)
+
+ %.bc: %.ml
+- ocamlc -w Ae -warn-error Ae -I .. -dllpath .. str.cma sqlite3.cma $< -o $@
++ ocamlc -w Ae -I .. -dllpath .. str.cma sqlite3.cma $< -o $@
+
+ %.exe: %.ml
+- ocamlopt -w Ae -warn-error Ae -I .. str.cmxa sqlite3.cmxa $< -o $@
++ ocamlopt -w Ae -I .. str.cmxa sqlite3.cmxa $< -o $@
+
+ clean:
+ rm -f \
diff --git a/ocaml-sqlite.spec b/ocaml-sqlite.spec
index a4a78e5..e079c15 100644
--- a/ocaml-sqlite.spec
+++ b/ocaml-sqlite.spec
@@ -2,18 +2,20 @@
%define debug_package %{nil}
Name: ocaml-sqlite
-Version: 1.6.1
-Release: 2%{?dist}
+Version: 1.6.3
+Release: 1%{?dist}
Summary: OCaml library for accessing SQLite3 databases
Group: Development/Libraries
License: BSD
-URL: http://www.ocaml.info/home/ocaml_sources.html#ocaml-sqlite3
-Source0: http://hg.ocaml.info/release/ocaml-sqlite3/archive/release-%{version}.tar.bz2
+URL: https://bitbucket.org/mmottl/sqlite3-ocaml
+Source0: https://bitbucket.org/mmottl/sqlite3-ocaml/downloads/sqlite3-ocaml-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x
Patch0: ocaml-sqlite-debian-install-no-mktop.patch
+# Disable all use of -warn-error.
+Patch1: ocaml-sqlite-1.6.3-no-warn-error.patch
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
@@ -43,8 +45,9 @@ developing applications that use %{name}.
%prep
-%setup -q -n ocaml-sqlite3-release-%{version}
+%setup -q -n sqlite3-ocaml-%{version}
%patch0 -p1
+%patch1 -p1
./configure --libdir=%{_libdir}
@@ -104,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Jul 3 2012 Richard W.M. Jones <rjones at redhat.com> - 1.6.3-1
+- New upstream version 1.6.3.
+- Change download URLs.
+
* Mon Jun 11 2012 Richard W.M. Jones <rjones at redhat.com> - 1.6.1-2
- Rebuild for OCaml 4.00.0.
diff --git a/sources b/sources
index 11cf9a4..aac4046 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f51ef6ae3402ac28582d7c44b5b4f941 release-1.6.1.tar.bz2
+bb27e99eed1c35989854272f7e83a232 sqlite3-ocaml-1.6.3.tar.gz
More information about the scm-commits
mailing list