diff --git a/findlib-1.3.3.patch b/findlib-1.3.3.patch
deleted file mode 100644
index ffe2d21..0000000
--- a/findlib-1.3.3.patch
+++ /dev/null
@@ -1,133 +0,0 @@
----
- Makefile                     |   32 ++++++++++++++++----------------
- src/findlib-toolbox/Makefile |    2 +-
- src/findlib/Makefile         |   22 +++++++++++-----------
- 3 files changed, 28 insertions(+), 28 deletions(-)
-
-Index: findlib-1.5.5/Makefile
-===================================================================
---- findlib-1.5.5.orig/Makefile
-+++ findlib-1.5.5/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
- 	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
- 
-@@ -71,32 +71,32 @@ findlib.conf: findlib.conf.in
- 
- .PHONY: install-doc
- install-doc:
--	mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
--	-cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
--	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
-+	mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
-+	-cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
-+	-cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
- 
- .PHONY: uninstall-doc
- uninstall-doc:
--	rm -f "$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1"
--	rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3"
--	rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3"
--	rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/META.5"
--	rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5"
-+	rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1"
-+	rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3"
-+	rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3"
-+	rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5"
-+	rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5"
- 
- 
- .PHONY: install-meta
- install-meta:
--	for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
-+	for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
- 
- .PHONY: uninstall-meta
- uninstall-meta:
--	for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
-+	for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
- 
- .PHONY: install-config
- install-config:
--	mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
--	@if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
--	test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
-+	mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
-+	@if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
-+	test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
- 
- .PHONY: uninstall-config
- uninstall-config:
-Index: findlib-1.5.5/src/findlib-toolbox/Makefile
-===================================================================
---- findlib-1.5.5.orig/src/findlib-toolbox/Makefile
-+++ findlib-1.5.5/src/findlib-toolbox/Makefile
-@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
- 	 	findlib.cma make_wizard.ml
- 
- install:
--	cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
-+	cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
- 
- # uninstall: Nothing to do, because the removal of the findlib core also
- # deinstalls the make_wizard
-Index: findlib-1.5.5/src/findlib/Makefile
-===================================================================
---- findlib-1.5.5.orig/src/findlib/Makefile
-+++ findlib-1.5.5/src/findlib/Makefile
-@@ -97,30 +97,30 @@ clean:
- 	  ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
- 
- install: all
--	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
--	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
--	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
-+	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 findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi 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)"; }; \
--	cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
-+	cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
- 	# the following "if" block is only needed for 4.00beta2
- 	if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
- 	    cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
--	    cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
-+	    cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
- 	fi
- 
- install-num-top:
--	mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
-+	mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
- 	cp num_top.cma num_top.cmi num_top_printers.cmi \
--		"$(prefix)$(OCAML_SITELIB)/num-top"
-+		"$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
- 
- # Note: uninstall-num-top is part of the removal of the META files.
- 
- uninstall:
--	rm -f $(prefix)$(OCAML_CORE_STDLIB)/findlib
--	rm -rf $(prefix)$(OCAML_SITELIB)/$(NAME)
--	rm -f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
-+	rm -f $(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/findlib
-+	rm -rf $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)
-+	rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
- 
- 
- depend: *.ml *.mli fl_meta.ml fl_metascanner.ml
diff --git a/findlib-1.6.2.tar.xz b/findlib-1.6.2.tar.xz
deleted file mode 100644
index 7237915..0000000
--- a/findlib-1.6.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb979f1c85f037614f357ddf0889ef66a79745e24ef3df02507f283aec0ed1c8
-size 156780
diff --git a/findlib-1.7.3.tar.xz b/findlib-1.7.3.tar.xz
new file mode 100644
index 0000000..1a9892d
--- /dev/null
+++ b/findlib-1.7.3.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cabb6cd484380e41fb20bf5ec6acc65d20769363754a73c74951dd4238b20111
+size 159972
diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes
index 60dc8da..ef94ee6 100644
--- a/ocaml-findlib.changes
+++ b/ocaml-findlib.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+-------------------------------------------------------------------
+Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de
+
+- Update to upstream version 1.7.3
+   Fix regarding num-top: this library is now also  optional, as num.
+   Trying to protect against failures when  several package installs are done in parallel.
+   New subpackage "findlib.top" for the toploop
+   The "num" library is now optional.
+   New command "ocamlfind printppx" that outputs how the ppx preprocessor would be called
+   Support for the raw_spacetime library that comes with OCaml 4.04
+   Require that ocamlc and ocamlc.opt are installed to the same directory
+   "ocamlfind printconf" respects the  environment variable OCAMLFIND_CONF
+   Build with -opaque
+   Preliminary support for native toplevel
+   New options: ocamlfind query -qe -qo
+- drop findlib-1.3.3.patch
+
+-------------------------------------------------------------------
+Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de
+
+- Wrap specfile conditionals to fix quilt setup
+
+-------------------------------------------------------------------
+Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de
+
+- Remove autodeps for pre openSUSE 12.1 releases
+
 -------------------------------------------------------------------
 Wed May 18 21:34:23 UTC 2016 - ohering@suse.de
 
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 3b37225..dd68223 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml-findlib
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX 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
@@ -18,23 +18,16 @@
 
 
 Name:           ocaml-findlib
-Version:        1.6.2
+Version:        1.7.3
 Release:        0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
 Summary:        Objective CAML package manager and build helper
 License:        MIT
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 
 Url:            http://projects.camlcity.org/projects/findlib.html
 Source0:        findlib-%{version}.tar.xz
-Patch0:         findlib-1.3.3.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-findlib
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
-%if 0%{?suse_version} < 1210
-Requires:       ocaml-findlib-devel
-%endif
-# ocaml autodep end for pkg: ocaml-findlib
 #
 Recommends:     ocaml-findlib-camlp4
 #
@@ -62,7 +55,7 @@ libraries in programs and scripts.
 
 %package        devel
 Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
 
 %description    devel
@@ -72,14 +65,8 @@ for developing applications that use ocaml-findlib.
 
 
 %package camlp4
-# ocaml autodep start for pkg: ocaml-findlib-camlp4
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
-%if 0%{?suse_version} < 1210
-Requires:       ocaml-findlib
-%endif
-# ocaml autodep end for pkg: ocaml-findlib-camlp4
 Summary:        Development files for ocaml-findlib
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Requires:       ocaml-camlp4-devel
 
 %description camlp4
@@ -87,7 +74,6 @@ The ocaml-findlib-camlp4 contains signature files for developing applications th
 
 %prep
 %setup -q -n findlib-%{version}
-%patch0 -p1
 
 %build
 (cd tools/extract_args && make)
@@ -98,13 +84,13 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam
   -mandir %{_mandir} \
   -with-toolbox
 make all
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 make opt
 %endif
 rm doc/guide-html/TIMESTAMP
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install prefix=$RPM_BUILD_ROOT
 rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 
 %files
@@ -115,32 +101,18 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %{_mandir}/man?/*
 #
 %dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/bigarray
-%{_libdir}/ocaml/bigarray/META
-%dir %{_libdir}/ocaml/bytes
-%{_libdir}/ocaml/bytes/META
-%dir %{_libdir}/ocaml/compiler-libs
-%{_libdir}/ocaml/compiler-libs/META
-%dir %{_libdir}/ocaml/dynlink
-%{_libdir}/ocaml/dynlink/META
-%dir %{_libdir}/ocaml/graphics
-%{_libdir}/ocaml/graphics/META
-%dir %{_libdir}/ocaml/num
-%{_libdir}/ocaml/num/META
-%dir %{_libdir}/ocaml/ocamldoc
-%{_libdir}/ocaml/ocamldoc/META
-%dir %{_libdir}/ocaml/stdlib
-%{_libdir}/ocaml/stdlib/META
-%dir %{_libdir}/ocaml/str
-%{_libdir}/ocaml/str/META
-%dir %{_libdir}/ocaml/threads
-%{_libdir}/ocaml/threads/META
-%dir %{_libdir}/ocaml/unix
-%{_libdir}/ocaml/unix/META
+%dir %{_libdir}/ocaml/*
+%{_libdir}/ocaml/*/META
 #
+%exclude %dir %{_libdir}/ocaml/camlp4
+%exclude %dir %{_libdir}/ocaml/findlib
+%exclude %dir %{_libdir}/ocaml/num-top
+%exclude %{_libdir}/ocaml/camlp4/META
+%exclude %{_libdir}/ocaml/findlib/META
+%exclude %{_libdir}/ocaml/num-top/META
 %{_libdir}/ocaml/topfind
 %dir %{_libdir}/ocaml/findlib
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 
@@ -154,7 +126,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %dir %{_libdir}/ocaml/num-top
 %{_libdir}/ocaml/findlib/META
 %{_libdir}/ocaml/num-top/META
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmxa
 %endif