diff --git a/_service b/_service new file mode 100644 index 0000000..f00eeb0 --- /dev/null +++ b/_service @@ -0,0 +1,17 @@ + + + ocaml-menhir + ad9297c0a505e878fb60b77f3b83a9caa1e42548 + git + disable + https://gitlab.inria.fr/fpottier/menhir.git + @PARENT_TAG@ + [v]?([^\+]+)(.*) + \1 + + + *.tar + xz + + + diff --git a/menhir-20170712.tar.gz b/menhir-20170712.tar.gz deleted file mode 100644 index ac12a92..0000000 --- a/menhir-20170712.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca482d690052343d6cb9452433248a0a92cc8bfc8fa529dc313220c9d7c0d000 -size 855262 diff --git a/ocaml-menhir-20200211.tar.xz b/ocaml-menhir-20200211.tar.xz new file mode 100644 index 0000000..820a090 --- /dev/null +++ b/ocaml-menhir-20200211.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf3f1801778eae2cd95702589e4dead67054a8ff5de9f2d43ae28da2cf3aa25d +size 1832544 diff --git a/ocaml-menhir.changes b/ocaml-menhir.changes index 64b91f6..804e256 100644 --- a/ocaml-menhir.changes +++ b/ocaml-menhir.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 29 20:20:20 UTC 2020 - ohering@suse.de + +- update version 20200211, with _service file +- Require dune 2.0+ + ------------------------------------------------------------------- Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de diff --git a/ocaml-menhir.spec b/ocaml-menhir.spec index 7590cc1..2534d0c 100644 --- a/ocaml-menhir.spec +++ b/ocaml-menhir.spec @@ -12,25 +12,24 @@ # 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/ # Name: ocaml-menhir -Version: 20170712 +Version: 20200211 Release: 0 %{?ocaml_preserve_bytecode} Summary: LR(1) parser generator for the OCaml programming language License: LGPL-2.0 Group: Development/Languages/OCaml -Url: http://gallium.inria.fr/~fpottier/menhir/ -Source: http://gallium.inria.fr/~fpottier/menhir/menhir-%{version}.tar.gz +Url: https://opam.ocaml.org/packages/menhir +Source: %{name}-%{version}.tar.xz +BuildRequires: time BuildRequires: ocaml -BuildRequires: ocaml-findlib -BuildRequires: ocaml-ocamlbuild -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ocaml-dune >= 2.0 +BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocamlfind(unix) %description LR(1) parser generator @@ -45,61 +44,29 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep -%setup -q -n menhir-%{version} +%autosetup -p1 %build -o= -make \ -%if 0%{?ocaml_native_compiler} - TARGET=native \ -%else - TARGET=byte \ -%endif - PREFIX=${o}%{_prefix} \ - %{?_smp_mflags} \ - -j 1 +dune_release_pkgs='menhir,menhirLib,menhirSdk' +%ocaml_dune_setup +%ocaml_dune_build %install -o=%{buildroot} -OCAMLFIND_DESTDIR=%{buildroot}`ocamlc -where` -mkdir -vp ${OCAMLFIND_DESTDIR} -make \ - install \ -%if 0%{?ocaml_native_compiler} - TARGET=native \ +%ocaml_dune_install +%ocaml_create_file_list + +%check +%ifarch x86_64 %else - TARGET=byte \ +dune_test_tolerate_fail='dune_test_tolerate_fail bitsize' %endif - PREFIX=${o}%{_prefix} \ - OCAMLFIND_DESTDIR=${OCAMLFIND_DESTDIR} \ - %{?_smp_mflags} \ - -j 1 -rm -rfv %{buildroot}/usr/share/doc +%ocaml_dune_test -%files -%defattr(-,root,root) -%doc CHANGES.md LICENSE manual.pdf +%files -f %{name}.files +%doc CHANGES.md %{_bindir}/* -%{_datadir}/menhir -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%{_libdir}/ocaml/*/META -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.o -%endif -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/*.cmo - -%files devel -%defattr(-,root,root,-) -%doc LICENSE %{_mandir}/*/* -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmx -%endif -%{_libdir}/ocaml/*/*.mli -%{_libdir}/ocaml/*/*.ml + +%files devel -f %{name}.files.devel %changelog