diff --git a/findlib-1.3.3.patch b/findlib-1.3.3.patch
index 619e79b..e7efd26 100644
--- a/findlib-1.3.3.patch
+++ b/findlib-1.3.3.patch
@@ -4,28 +4,29 @@
src/findlib/Makefile | 22 +++++++++++-----------
3 files changed, 28 insertions(+), 28 deletions(-)
-Index: findlib-1.3.3/Makefile
+Index: findlib-1.5.3/Makefile
===================================================================
---- findlib-1.3.3.orig/Makefile
-+++ findlib-1.3.3/Makefile
-@@ -17,13 +17,13 @@ opt:
- for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
+--- findlib-1.5.3.orig/Makefile
++++ findlib-1.5.3/Makefile
+@@ -17,14 +17,14 @@ opt:
+ for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
install:
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
+ $(MAKE) install-config
for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
$(MAKE) install-meta
cd src/findlib; $(MAKE) install-num-top
- $(MAKE) install-config
-- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
-+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ if [ $(INSTALL_CAMLP4) -eq 1 ]; then \
+- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \
++ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \
+ fi
$(MAKE) install-doc
- uninstall:
-@@ -66,32 +66,32 @@ findlib.conf: findlib.conf.in
+@@ -71,32 +71,32 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
@@ -71,10 +72,10 @@ Index: findlib-1.3.3/Makefile
.PHONY: uninstall-config
uninstall-config:
-Index: findlib-1.3.3/src/findlib-toolbox/Makefile
+Index: findlib-1.5.3/src/findlib-toolbox/Makefile
===================================================================
---- findlib-1.3.3.orig/src/findlib-toolbox/Makefile
-+++ findlib-1.3.3/src/findlib-toolbox/Makefile
+--- findlib-1.5.3.orig/src/findlib-toolbox/Makefile
++++ findlib-1.5.3/src/findlib-toolbox/Makefile
@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
findlib.cma make_wizard.ml
@@ -84,12 +85,12 @@ Index: findlib-1.3.3/src/findlib-toolbox/Makefile
# uninstall: Nothing to do, because the removal of the findlib core also
# deinstalls the make_wizard
-Index: findlib-1.3.3/src/findlib/Makefile
+Index: findlib-1.5.3/src/findlib/Makefile
===================================================================
---- findlib-1.3.3.orig/src/findlib/Makefile
-+++ findlib-1.3.3/src/findlib/Makefile
-@@ -80,30 +80,30 @@ clean:
- ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
+--- findlib-1.5.3.orig/src/findlib/Makefile
++++ findlib-1.5.3/src/findlib/Makefile
+@@ -87,30 +87,30 @@ clean:
+ #rm -f ocaml_args.ml
install: all
- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
@@ -98,7 +99,7 @@ Index: findlib-1.3.3/src/findlib/Makefile
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
- files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
+ files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
diff --git a/findlib-1.3.3.tar.xz b/findlib-1.3.3.tar.xz
deleted file mode 100644
index 09dc424..0000000
--- a/findlib-1.3.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:181e0855a2eaae0b16fb48ba8ee4a80fe3a6d24f9b586ba58072007fab4a0b99
-size 139860
diff --git a/findlib-1.5.3.tar.xz b/findlib-1.5.3.tar.xz
new file mode 100644
index 0000000..af38e29
--- /dev/null
+++ b/findlib-1.5.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4638dda108c1ac098b84f890078e04ef1cd8e01eb34a949211ad3779d52263cf
+size 149384
diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes
index 98ab37e..a5ec31d 100644
--- a/ocaml-findlib.changes
+++ b/ocaml-findlib.changes
@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Oct 8 14:18:37 CEST 2014 - ohering@suse.de
+
+- Update to upstream version 1.5.3
+ The installation of "bytes" respects now $prefix and the
+ configured destination.
+ New option -pp for "ocamlfind query", to get preprocessor
+ packages. Updated the compatibility Bytes module to support
+ extend, init, mapi, blit_string.
+- 1.5.2: support for the query formats "%+a" and "%+A".
+ Fix: the "ppx" property is now also path-expanded when
+ interpreted in a toploop.
+ Fix: implicit "ppx" is not path-expanded anymore.
+ Fix: Build bytes.cmxs only if natdynlink is enabled.
+- 1.5.1: includes a file that was missing in 1.5
+- 1.5: Including the "bytes" package that is either a compat
+ package for ocaml < 4.02 or a fake package for ocaml >= 4.02.
+ The package aims at helping to support the transition to the new
+ "bytes" type for mutable strings.
+ Also installing findlib.cmxs if OCaml supports it.
+ Allowing to disable camlp4 (in prep for OCaml-4.02).
+ The "ppx" package property can be specified for constructing
+ ppx-type preprocessor.
+- 1.4.1:ocamldoc: The order of -ppopt arguments was changed by
+ ocamlfind, which is not correct.
+- 1.4: Fixed performance bug when many arguments need to be processed.
+ Auto-configuring ocamldoc.opt if it is found.
+ New config switch -no-custom to prevent that "ocamlfind" is
+ linked in custom-runtime mode (bytecode only).
+ The library dbm is no longer part of OCaml, and now optional in
+ findlib
+ Support for ocamloptp.
+ New function Topfind.log for controlling the verbosity.
+ Rewritten Fl_metascanner without camlp4
+
-------------------------------------------------------------------
Mon Jun 3 09:23:34 CEST 2013 - ohering@suse.de
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 8efeac8..7d8f79e 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-findlib
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010-2011 Andrew Psaltis <ampsaltis at gmail dot com>
#
# All modifications and additions to the file contributed by third parties
@@ -26,7 +26,7 @@
%endif
Name: ocaml-findlib
-Version: 1.3.3
+Version: 1.5.3
Release: 0
Summary: Objective CAML package manager and build helper
License: MIT