Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2019-09-07 12:35:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml" Sat Sep 7 12:35:33 2019 rev:69 rq:727703 version:4.05.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2019-08-27 10:15:00.555965051 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new.7948/ocaml.changes 2019-09-07 12:35:36.373656719 +0200 @@ -1,0 +2,13 @@ +Fri Aug 30 14:37:07 UTC 2019 - Stefan Brüns <[email protected]> + +- Use separate package for emacs mode files, following upstreams + move of the files to a separate repository + (https://github.com/ocaml/ocaml/pull/2182). This reduces the + build dependency chain of OCaml significantly, and in turn of + every package depending on OCaml. +- Move caml-mode specific patches to new package: + * ocaml-3.00-camldebug_el.patch + * ocaml-3.04-ocamltags--no-site-start.patch + * ocaml-3.09-emacs_localcompile.patch + +------------------------------------------------------------------- Old: ---- ocaml-3.00-camldebug_el.patch ocaml-3.04-ocamltags--no-site-start.patch ocaml-3.09-emacs_localcompile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.JYnkna/_old 2019-09-07 12:35:37.825656528 +0200 +++ /var/tmp/diff_new_pack.JYnkna/_new 2019-09-07 12:35:37.825656528 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Andrew Psaltis <ampsaltis at gmail dot com> # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail dot com> # @@ -14,7 +14,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -55,19 +55,15 @@ Source0: http://caml.inria.fr/pub/distrib/ocaml-%{ocaml_base_version}/ocaml-%{version}.tar.xz Source1: ocaml-findlib.rpm.prov_req.attr.sh Source2: rpmlintrc -Patch0: ocaml-3.00-camldebug_el.patch Patch1: ocamldoc-man-th.patch -Patch2: ocaml-3.04-ocamltags--no-site-start.patch # FIX-UPSTREAM pass RPM_OPT_FLAGS to build Patch4: ocaml-configure-Allow-user-defined-C-compiler-flags.patch Patch5: ocaml-3.08.3-gcc4.patch -Patch7: ocaml-3.09-emacs_localcompile.patch Patch8: ocaml-4.05.0-CVE-2018-9838.patch # FIX-UPSTREAM backport 'AArch64 GOT fixed' - https://github.com/ocaml/ocaml/pull/1330 Patch9: ocaml-fix_aarch64_build.patch # This gets ocamlobjinfo to work with .cmxs files BuildRequires: binutils-devel -BuildRequires: emacs-nox BuildRequires: fdupes BuildRequires: ncurses-devel BuildRequires: pkgconfig @@ -148,20 +144,6 @@ This package contains a documentation generator for OCaml. -%package emacs -Summary: Emacs mode for OCaml -License: GPL-2.0-or-later -Group: Development/Languages/OCaml -Requires: emacs -Requires: ocaml = %{version} -Provides: caml-mode - -%description emacs -OCaml is a high-level, strongly-typed, functional and object-oriented -programming language from the ML family of languages. - -This package provides Emacs mode for OCaml. - %package compiler-libs Summary: Libraries used internal to the OCaml Compiler License: QPL-1.0 @@ -232,20 +214,6 @@ %{buildroot}%{_libdir}/ocaml/libasmrun_pic.a \ %{buildroot}%{_libdir}/ocaml/libasmrun.a fi -EMACS_SITE_LISP=%{_datadir}/emacs/site-lisp -pushd emacs - make install DESTDIR=%{buildroot} EMACSDIR=%{buildroot}${EMACS_SITE_LISP} - make install-ocamltags SCRIPTDIR=%{buildroot}${EMACS_SITE_LISP} -popd - -# fix bnc#411232 -echo '(load "ocaml.el" nil t t)' >%{buildroot}${EMACS_SITE_LISP}/suse-start-ocaml.el -tee %{buildroot}${EMACS_SITE_LISP}/%{name}.el <<EOF -(autoload 'caml-mode "caml" "Caml editing mode" t) -(add-hook 'caml-mode-hook 'font-lock-mode) -(add-to-list 'auto-mode-alist '("\\\\.mli?$" . caml-mode)) -EOF -#' # restore highlighting context in vim export EXCLUDE_FROM_STRIP="ocamldebug ocamlbrowser" @@ -453,12 +421,6 @@ %{_libdir}/ocaml/ocamldoc %doc ocamldoc/Changes.txt -%files emacs -%doc emacs/README -%dir %{_datadir}/emacs -%dir %{_datadir}/emacs/site-lisp -%{_datadir}/emacs/site-lisp/* - %files compiler-libs %license LICENSE %{_libdir}/ocaml/compiler-libs
