Hello community, here is the log from the commit of package ocaml-oasis for openSUSE:Factory checked in at 2017-08-18 15:03:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-oasis (Old) and /work/SRC/openSUSE:Factory/.ocaml-oasis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-oasis" Fri Aug 18 15:03:36 2017 rev:2 rq:517020 version:0.4.9.20170523.2e34867 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-oasis/ocaml-oasis.changes 2016-07-15 12:47:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-oasis.new/ocaml-oasis.changes 2017-08-18 15:03:44.159798919 +0200 @@ -1,0 +2,22 @@ +Tue Jul 25 13:04:54 UTC 2017 - [email protected] + +- Use Group: Development/Languages/OCaml + +------------------------------------------------------------------- +Mon Jul 17 20:24:18 UTC 2017 - [email protected] + +- Update to version 0.4.9.20170523.2e34867 + See included CHANGES.txt for details + add ocaml-oasis.patch + +------------------------------------------------------------------- +Mon Jul 17 12:48:58 UTC 2017 - [email protected] + +- Wrap specfile conditionals to fix quilt setup + +------------------------------------------------------------------- +Mon Jul 17 10:48:58 UTC 2017 - [email protected] + +- Remove autodeps for pre openSUSE 12.1 releases + +------------------------------------------------------------------- Old: ---- oasis-0.4.6.tar.xz New: ---- _service oasis-0.4.9.20170523.2e34867.tar.xz ocaml-oasis.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-oasis.spec ++++++ --- /var/tmp/diff_new_pack.iYpM60/_old 2017-08-18 15:03:46.787429029 +0200 +++ /var/tmp/diff_new_pack.iYpM60/_new 2017-08-18 15:03:46.795427903 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocaml-oasis # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,38 +18,29 @@ %global __ocaml_requires_opts -i OASISAstTypes -i MainGettext Name: ocaml-oasis -Version: 0.4.6 +Version: 0.4.9.20170523.2e34867 Release: 0 -%{ocaml_preserve_bytecode} +%{?ocaml_preserve_bytecode} Summary: Architecture for building OCaml libraries and applications License: LGPL-2.1 -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Url: http://oasis.forge.ocamlcore.org/ Source0: oasis-%{version}.tar.xz +Patch0: ocaml-oasis.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ocamlfind(findlib) Requires: ocamlfind(ocamlbuild) -# ocaml autodep start for pkg: ocaml-oasis -# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires -%if 0%{?suse_version} < 1210 -Requires: ocaml-findlib ocaml-ocamlbuild ocaml-odn ocaml-runtime -%endif -# ocaml autodep end for pkg: ocaml-oasis BuildRequires: ocaml BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-rpm-macros >= 4.03 -BuildRequires: ocamlfind(camlp4.macro) +BuildRequires: ocamlify +BuildRequires: ocamlmod BuildRequires: ocamlfind(dynlink) BuildRequires: ocamlfind(findlib) BuildRequires: ocamlfind(ocamlbuild) -BuildRequires: ocamlfind(odn) -BuildRequires: ocamlfind(odn.with.syntax) -BuildRequires: ocamlfind(type_conv) BuildRequires: ocamlfind(unix) -BuildRequires: ocamlify -BuildRequires: ocamlmod %description OASIS generates a full configure, build and install system for your @@ -58,7 +49,7 @@ %package devel Summary: Development files for %{name} -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Requires: %{name} = %{version} %description devel @@ -67,6 +58,7 @@ %prep %setup -q -n oasis-%{version} +%patch0 -p1 %build %ocaml_oasis_configure --enable-docs @@ -78,11 +70,11 @@ %files %defattr(-,root,root,-) -%doc COPYING.txt +%doc COPYING.txt CHANGES.txt %{_bindir}/* %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -91,7 +83,7 @@ %{oasis_docdir_html} %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* -%if %{ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmx %{_libdir}/ocaml/*/*.cmxa ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">git://github.com/ocaml/oasis.git</param> <param name="scm">git</param> <param name="versionformat">0.4.9.%cd.%h</param> <param name="revision">master</param> <param name="filename">oasis</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ ocaml-oasis.patch ++++++ Revert 70c197cc4 (" Make OCamlbuild plugin not assume that dynamic linking is supported.") --- a/src/oasis/OASISLibrary.ml +++ b/src/oasis/OASISLibrary.ml @@ -148,16 +148,16 @@ let generated_unix_files (* Add C library to be built *) let acc_nopath = - if bs.bs_c_sources <> [] then begin - ["lib"^cs.cs_name^"_stubs"^ext_lib] - :: - if has_native_dynlink then - ["dll"^cs.cs_name^"_stubs"^ext_dll] :: acc_nopath - else - acc_nopath - end else begin + if bs.bs_c_sources <> [] then + begin + ["lib"^cs.cs_name^"_stubs"^ext_lib] + :: + ["dll"^cs.cs_name^"_stubs"^ext_dll] + :: + acc_nopath + end + else acc_nopath - end in (* All the files generated *) @@ -173,3 +173,4 @@ let generated_unix_files let schema = OASISLibrary_intern.schema + --- a/src/plugins/ocamlbuild/MyOCamlbuildBase.ml +++ b/src/plugins/ocamlbuild/MyOCamlbuildBase.ml @@ -192,9 +192,8 @@ let dispatch t e = flag ["link"; "library"; "ocaml"; "native"; tag_libstubs lib] (S[A"-cclib"; A("-l"^(nm_libstubs lib))]); - if bool_of_string (BaseEnvLight.var_get "native_dynlink" env) then - flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib] - (S[A"-dllib"; A("dll"^(nm_libstubs lib))]); + flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib] + (S[A"-dllib"; A("dll"^(nm_libstubs lib))]); (* When ocaml link something that use the C library, then one need that file to be up to date.
