Hello community, here is the log from the commit of package opam for openSUSE:Factory checked in at 2019-11-10 22:56:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opam (Old) and /work/SRC/openSUSE:Factory/.opam.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opam" Sun Nov 10 22:56:22 2019 rev:4 rq:747248 version:2.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/opam/opam.changes 2019-03-21 09:53:08.350791473 +0100 +++ /work/SRC/openSUSE:Factory/.opam.new.2990/opam.changes 2019-11-10 22:56:23.494817423 +0100 @@ -1,0 +2,7 @@ +Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de + +- Require current dune macros +- Update to 2.0.5, via _service file + See included CHANGES for details + +------------------------------------------------------------------- Old: ---- opam-2.0.3.tar.gz New: ---- _service opam-2.0.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opam.spec ++++++ --- /var/tmp/diff_new_pack.jeQUS8/_old 2019-11-10 22:56:24.426818614 +0100 +++ /var/tmp/diff_new_pack.jeQUS8/_new 2019-11-10 22:56:24.458818656 +0100 @@ -17,34 +17,33 @@ Name: opam -Version: 2.0.3 +Version: 2.0.5 Release: 0 Summary: Source-based package manager for OCaml License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception Group: System/Packages URL: https://opam.ocaml.org/ -Source: https://github.com/ocaml/opam/archive/%{version}/%{name}-%{version}.tar.gz - -BuildRequires: curl +Source: %{name}-%{version}.tar.xz +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: ocaml >= 4.02.3 +BuildRequires: ocaml +BuildRequires: ocaml-cppo BuildRequires: ocaml-dune -BuildRequires: ocamlfind -BuildRequires: ocaml(Ocamlbuild) -BuildRequires: ocaml(Odoc) +BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocamlfind(bigarray) BuildRequires: ocamlfind(cmdliner) -BuildRequires: ocamlfind(cppo) BuildRequires: ocamlfind(cudf) -BuildRequires: ocamlfind(dose3) -BuildRequires: ocamlfind(extlib) +BuildRequires: ocamlfind(dose3.algo) +BuildRequires: ocamlfind(mccs) BuildRequires: ocamlfind(ocamlgraph) BuildRequires: ocamlfind(opam-file-format) BuildRequires: ocamlfind(re) +BuildRequires: ocamlfind(unix) Requires: %{name}-installer%{?_isa} = %{version}-%{release} Requires: bubblewrap -Requires: mccs # https://cygwin.com/ml/cygwin/2018-01/msg00079.html Requires: bzip2 @@ -70,36 +69,49 @@ %package installer Summary: Standalone tool for opam install files Group: System/Packages +Requires: %{name} = %{version}-%{release} %description installer Handles (un)installation of package files following instructions from OPAM *.install files. +%package devel +Summary: Development files for %{name} +Group: Development/Languages/OCaml +Requires: %{name} = %{version} + +%description devel +The %{name}-devel package contains libraries and signature files for +developing applications that use %{name}. + %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 %build +# wipe bogus FETCH +sed -i~ '/FETCH/d;232,+7d' configure.ac +diff -u "$_"~ "$_" && exit 1 +export DUNE=$(type -P dune) +export CPPO=$(type -P cppo) +export PATCH=$(type -P false) +export BUNZIP2=$(type -P false) +autoreconf -fi %configure -make all man +dune_release_pkgs='opam,opam-client,opam-core,opam-format,opam-installer,opam-repository,opam-solver,opam-state' +%ocaml_dune_setup +%ocaml_dune_build %install -%make_install LIBINSTALL_DIR=%{buildroot}%{_libdir}/ocaml -# Prevent installation of doc files in wrong directory -rm -r %{buildroot}%{_prefix}/doc - -%files -%doc AUTHORS CHANGES CONTRIBUTING.md README.md -%license LICENSE +%ocaml_dune_install +%ocaml_create_file_list + +%files -f %{name}.files +%doc CHANGES %{_bindir}/opam -%{_mandir}/man1/*.1%{?ext_man} + +%files devel -f %{name}.files.devel %files installer -%license LICENSE %{_bindir}/opam-installer -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/opam-installer/ -%{_libdir}/ocaml/opam-installer/opam -%{_libdir}/ocaml/opam-installer/META -%{_libdir}/ocaml/opam-installer/dune-package %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <!-- 2.0.5 --> <param name="revision">2b2e2c6331dda761cc0c7d7632300281bf066ca6</param> <param name="scm">git</param> <param name="submodules">disable</param> <param name="url">https://github.com/ocaml/opam.git</param> <param name="versionformat">@PARENT_TAG@</param> </service> <service mode="disabled" name="recompress"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> <service mode="disabled" name="set_version"/> </services>