commit ocaml-findlib for openSUSE:Factory

31 Oct 2014

Hello community,

here is the log from the commit of package ocaml-findlib for openSUSE:Factory checked in at 2014-10-31 18:27:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-findlib (Old)
 and      /work/SRC/openSUSE:Factory/.ocaml-findlib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ocaml-findlib"

Changes:
--------

--- /work/SRC/openSUSE:Factory/ocaml-findlib/ocaml-findlib.changes	2013-08-02 15:26:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-findlib.new/ocaml-findlib.changes	2014-10-31 20:19:52.000000000 +0100
@@ -1,0 +2,52 @@
+Thu Oct 23 17:01:25 UTC 2014 - ohering@suse.de
+
+-  Update to upstream version 1.5.5
+   New ppxopt META variables.
+   Support for OCAMLFIND_TOOLCHAIN environment variable.
+
+-------------------------------------------------------------------
+Thu Oct 23 12:40:36 UTC 2014 - ohering@suse.de
+
+- BuildRequire ocaml-rpm-macros
+
+-------------------------------------------------------------------
+Fri Oct 10 17:07:25 UTC 2014 - ohering@suse.de
+
+- BuildRequire at least ocaml 4.02
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------

Old:
----
  findlib-1.3.3.tar.xz

New:
----
  findlib-1.5.5.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ocaml-findlib.spec ++++++
--- /var/tmp/diff_new_pack.PSMOFB/_old	2014-10-31 20:19:52.000000000 +0100
+++ /var/tmp/diff_new_pack.PSMOFB/_new	2014-10-31 20:19:52.000000000 +0100
@@ -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
@@ -17,17 +17,10 @@
 #
 
 
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if !%opt
-# get rid of /usr/lib/rpm/find-debuginfo.sh
-# strip kills the bytecode part of ELF binaries
-# see also NO_BRP_STRIP_DEBUG in install section
-%undefine _build_create_debug
-%endif
-
-Name:           ocaml-findlib
-Version:        1.3.3
+Version:        1.5.5
 Release:        0
+%{ocaml_preserve_bytecode}
+Name:           ocaml-findlib
 Summary:        Objective CAML package manager and build helper
 License:        MIT
 Group:          Development/Libraries/Other
@@ -42,9 +35,10 @@
 BuildRequires:  gawk
 BuildRequires:  m4
 BuildRequires:  ncurses-devel
-BuildRequires:  ocaml
-BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml >= 4.02.0
+BuildRequires:  ocaml-camlp4-devel >= 4.02.0
 BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml-rpm-macros >= 4.02.1
 
 %description
 Findlib is a library manager for Objective Caml. It provides a
@@ -78,17 +72,12 @@
   -mandir %{_mandir} \
   -with-toolbox
 make all
-%if %opt
+%if %{ocaml_native_compiler}
 make opt
 %endif
 rm doc/guide-html/TIMESTAMP
 
 %install
-%if !%opt
-# get rid of /usr/lib/rpm/brp-strip-debug 
-# strip kills the bytecode part of ELF binaries
-export NO_BRP_STRIP_DEBUG=true
-%endif
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %files
@@ -98,20 +87,19 @@
 %{_bindir}/*
 %{_mandir}/man?/*
 %{_libdir}/ocaml/bigarray
-%{_libdir}/ocaml/dbm
+%{_libdir}/ocaml/camlp4
+%{_libdir}/ocaml/compiler-libs
 %{_libdir}/ocaml/dynlink
+%{_libdir}/ocaml/findlib
 %{_libdir}/ocaml/graphics
 %{_libdir}/ocaml/num
+%{_libdir}/ocaml/ocamlbuild
 %{_libdir}/ocaml/stdlib
 %{_libdir}/ocaml/str
-%{_libdir}/ocaml/unix
-%{_libdir}/ocaml/camlp4
-%{_libdir}/ocaml/ocamlbuild
 %{_libdir}/ocaml/threads
 %{_libdir}/ocaml/topfind
-%{_libdir}/ocaml/findlib
-%{_libdir}/ocaml/compiler-libs
-%if %opt
+%{_libdir}/ocaml/unix
+%if %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/findlib/*.a
 %exclude %{_libdir}/ocaml/findlib/*.cmxa
 %endif
@@ -122,11 +110,12 @@
 %files devel
 %defattr(-,root,root,-)
 %doc LICENSE doc/README doc/guide-html
-%if %opt
+%if %{ocaml_native_compiler}
 %{_libdir}/ocaml/findlib/*.a
 %{_libdir}/ocaml/findlib/*.cmxa
 %endif
 %{_libdir}/ocaml/findlib/*.mli
 %{_libdir}/ocaml/findlib/Makefile.config
+%{_libdir}/ocaml/bytes
 
 %changelog

++++++ findlib-1.3.3.patch ++++++
--- /var/tmp/diff_new_pack.PSMOFB/_old	2014-10-31 20:19:52.000000000 +0100
+++ /var/tmp/diff_new_pack.PSMOFB/_new	2014-10-31 20:19:52.000000000 +0100
@@ -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.5/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.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
- 	$(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 @@
  
  .PHONY: uninstall-config
  uninstall-config:
-Index: findlib-1.3.3/src/findlib-toolbox/Makefile
+Index: findlib-1.5.5/src/findlib-toolbox/Makefile
 ===================================================================
---- findlib-1.3.3.orig/src/findlib-toolbox/Makefile
-+++ findlib-1.3.3/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
  
@@ -84,11 +85,11 @@
  
  # 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.5/src/findlib/Makefile
 ===================================================================
---- findlib-1.3.3.orig/src/findlib/Makefile
-+++ findlib-1.3.3/src/findlib/Makefile
-@@ -80,30 +80,30 @@ clean:
+--- 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
@@ -98,7 +99,7 @@
 +	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)"; }; \

++++++ findlib-1.3.3.tar.xz -> findlib-1.5.5.tar.xz ++++++
++++ 10820 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)