commit ocaml-extlib for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-extlib for openSUSE:Factory
checked in at 2019-11-12 16:11:46
Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-extlib.new.2990 (New)
Package is "ocaml-extlib"
Tue Nov 12 16:11:46 2019 rev:7 rq:746699 version:1.7.6
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes
2019-05-09 14:28:20.533929682 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new.2990/ocaml-extlib.changes
2019-11-12 16:11:49.631778652 +0100
@@ -1,0 +2,6 @@
+Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de
+
+- Require current dune macros
+- Use _service file
+
+---
Old:
ocaml-extlib-1.7.6.tar.gz
New:
_service
ocaml-extlib-1.7.6.tar.xz
Other differences:
--
++ ocaml-extlib.spec ++
--- /var/tmp/diff_new_pack.5M7MAO/_old 2019-11-12 16:11:50.223779289 +0100
+++ /var/tmp/diff_new_pack.5M7MAO/_new 2019-11-12 16:11:50.227779293 +0100
@@ -13,7 +13,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/
#
@@ -25,12 +25,11 @@
License:LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
Group: Development/Languages/OCaml
Url:https://github.com/ygrek/ocaml-extlib
-Source0:
https://github.com/ygrek/ocaml-extlib/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:%{name}-%{version}.tar.xz
BuildRequires: ocaml
-BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.03
-BuildRequires: ocamlfind(cppo_ocamlbuild)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: ocaml-cppo
+BuildRequires: ocaml-dune
+BuildRequires: ocaml-rpm-macros >= 20191101
%description
ExtLib is a project aiming at providing a complete - yet small -
@@ -50,43 +49,23 @@
developing applications that use %{name}.
%prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1
%build
-make build doc -j1
+dune_release_pkgs='extlib'
+%ocaml_dune_setup
+%ocaml_dune_build
%install
-export DESTDIR=$RPM_BUILD_ROOT
-export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR
-make install -j1
-
-%files
-%defattr(-,root,root,-)
-%doc CHANGES README.md
-%license LICENSE
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
-
-%files devel
-%defattr(-,root,root,-)
-%doc CHANGES README.md src/doc/*
-%license LICENSE
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%endif
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmt
-%{_libdir}/ocaml/*/*.cmti
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
+%ocaml_dune_install
+%ocaml_create_file_list
+
+%check
+%ocaml_dune_test
+
+%files -f %{name}.files
+%doc README.md
+
+%files devel -f %{name}.files.devel
%changelog
++ _service ++
https://github.com/dune-universe/ocaml-extlib.git
git
1.7.6
duniverse-1.7.6
ocaml-extlib
*.tar
xz
commit ocaml-extlib for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-extlib for openSUSE:Factory
checked in at 2019-05-09 14:28:16
Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-extlib.new.5148 (New)
Package is "ocaml-extlib"
Thu May 9 14:28:16 2019 rev:6 rq:701638 version:1.7.6
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes
2019-02-24 17:09:41.908518698 +0100
+++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new.5148/ocaml-extlib.changes
2019-05-09 14:28:20.533929682 +0200
@@ -1,0 +2,12 @@
+Thu Mar 21 09:23:46 UTC 2019 - a...@onthewings.net
+
+- Update to upstream release 1.7.6
+ * Restore compilation on 32-bit (remove patch fix32bit.patch).
+ * Sync with OCaml 4.07.
+ * Install with Makefile.
+ * IO: read_i32_as_int.
+ * Fix Dllist.skip with negative argument.
+ * Fix IO.read_bits 31.
+- Use SPDX OCaml-LGPL-linking-exception.
+
+---
Old:
fix32bit.patch
ocaml-extlib-1.7.4.tar.gz
New:
ocaml-extlib-1.7.6.tar.gz
Other differences:
--
++ ocaml-extlib.spec ++
--- /var/tmp/diff_new_pack.93zgS4/_old 2019-05-09 14:28:21.921932895 +0200
+++ /var/tmp/diff_new_pack.93zgS4/_new 2019-05-09 14:28:21.945932951 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-extlib
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Andrew Psaltis
#
# All modifications and additions to the file contributed by third parties
@@ -18,16 +18,14 @@
Name: ocaml-extlib
-Version:1.7.4
+Version:1.7.6
Release:0
%{?ocaml_preserve_bytecode}
Summary:OCaml ExtLib additions to the standard library
-License:LGPL-2.1-or-later WITH OCaml-linking-exception
+License:LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
Group: Development/Languages/OCaml
Url:https://github.com/ygrek/ocaml-extlib
Source0:
https://github.com/ygrek/ocaml-extlib/archive/%{version}/%{name}-%{version}.tar.gz
-#
https://github.com/ygrek/ocaml-extlib/commit/21784d25591db39fe74ea2626bd703ba8b2b2181
-Patch0: fix32bit.patch
BuildRequires: ocaml
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03
@@ -53,7 +51,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1
%build
make build doc -j1
++ ocaml-extlib-1.7.4.tar.gz -> ocaml-extlib-1.7.6.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-extlib-1.7.4/.travis.yml
new/ocaml-extlib-1.7.6/.travis.yml
--- old/ocaml-extlib-1.7.4/.travis.yml 2018-03-12 10:01:45.0 +0100
+++ new/ocaml-extlib-1.7.6/.travis.yml 2019-03-03 17:33:48.0 +0100
@@ -2,12 +2,31 @@
sudo: required
install: wget
https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
-env:
- - OCAML_VERSION=4.02
- - OCAML_VERSION=4.03
- - OCAML_VERSION=4.04
- - OCAML_VERSION=4.05
- - OCAML_VERSION=4.06
-os:
- - linux
- - osx
+matrix:
+ include:
+ - env: OCAML_VERSION=4.02
+os: osx
+ - env: OCAML_VERSION=4.03
+os: osx
+ - env: OCAML_VERSION=4.04
+os: osx
+ - env: OCAML_VERSION=4.05
+os: osx
+ - env: OCAML_VERSION=4.06
+os: osx
+ - env: OCAML_VERSION=4.02
+os: linux
+ - env: OCAML_VERSION=4.03
+os: linux
+ - env: OCAML_VERSION=4.04
+os: linux
+ - env: OCAML_VERSION=4.05
+os: linux
+ - env: OCAML_VERSION=4.06
+os: linux
+ - env: OCAML_VERSION=4.06 OPAM_SWITCH=4.06.1+32bit
+os: linux
+addons:
+ apt:
+packages:
+- gcc-multilib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-extlib-1.7.4/CHANGES
new/ocaml-extlib-1.7.6/CHANGES
--- old/ocaml-extlib-1.7.4/CHANGES 2018-03-12 10:01:45.0 +0100
+++ new/ocaml-extlib-1.7.6/CHANGES 2019-03-03 17:33:48.0 +0100
@@ -1,3 +1,13 @@
+1.7.6 (2019-03-03)
+* fix Dllist.skip with negative argument (Virgile Robles)
+* fix IO.read_bits 31 (Dan Korostelev)
+
+1.7.5 (2018-07-08)
+ * IO: restore compilation on 32-bit (broken in 1.7.3)
+ * sync with OCaml 4.07
+ * install.ml is now deprecated, install with Makefile
+ + IO: read_i32_as_int
+
1.7.4 (2018-03-12)
* fix tests with OCaml 4.06
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocaml-extlib-1.7.4/Makefile
new/ocaml-extlib-1.7.6/Makefile
--- old/ocaml-extlib-1.7.4/Makefile 2018-03-12 10:01:45.0 +0100
+++ new/ocaml-extlib-1.7.6/Makefile 2019-03-03 17:33:48.0 +0100
@@ -1,6
commit ocaml-extlib for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-extlib for openSUSE:Factory
checked in at 2019-02-24 17:09:36
Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-extlib.new.28833 (New)
Package is "ocaml-extlib"
Sun Feb 24 17:09:36 2019 rev:5 rq:620955 version:1.7.4
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes
2017-08-18 15:01:44.128695735 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new.28833/ocaml-extlib.changes
2019-02-24 17:09:41.908518698 +0100
@@ -1,0 +2,14 @@
+Tue Apr 24 07:01:39 UTC 2018 - a...@onthewings.net
+
+- Update to upstream release 1.7.4
+ * String: faster slice
+ * various fixes for i31
+ * base64: add encode_string decode_string
+ * OCaml 4.06 compatibility
+- Add fix32bit.patch from upstream to fix building on 32-bit arch
+- Use upstream Makefile to build
+- Fix BuildRequires: cppo_ocamlbuild
+- Fix License: to include exception
+- Use GitHub archive as Source0:
+
+---
Old:
extlib-1.7.2.tar.gz
New:
fix32bit.patch
ocaml-extlib-1.7.4.tar.gz
Other differences:
--
++ ocaml-extlib.spec ++
--- /var/tmp/diff_new_pack.J598I3/_old 2019-02-24 17:09:42.784518423 +0100
+++ /var/tmp/diff_new_pack.J598I3/_new 2019-02-24 17:09:42.788518422 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-extlib
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Andrew Psaltis
#
# All modifications and additions to the file contributed by third parties
@@ -18,19 +18,20 @@
Name: ocaml-extlib
-Version:1.7.2
+Version:1.7.4
Release:0
%{?ocaml_preserve_bytecode}
Summary:OCaml ExtLib additions to the standard library
-License:LGPL-2.1+
+License:LGPL-2.1-or-later WITH OCaml-linking-exception
Group: Development/Languages/OCaml
Url:https://github.com/ygrek/ocaml-extlib
-Source0:extlib-%{version}.tar.gz
+Source0:
https://github.com/ygrek/ocaml-extlib/archive/%{version}/%{name}-%{version}.tar.gz
+#
https://github.com/ygrek/ocaml-extlib/commit/21784d25591db39fe74ea2626bd703ba8b2b2181
+Patch0: fix32bit.patch
BuildRequires: ocaml
-BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03
-BuildRequires: ocamlfind(ocamlbuild_cppo)
+BuildRequires: ocamlfind(cppo_ocamlbuild)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -51,85 +52,22 @@
developing applications that use %{name}.
%prep
-%setup -q -n extlib-%{version}
+%setup -q -n %{name}-%{version}
+%patch0 -p1
%build
-rm -fv setup.ml myocamlbuild.ml META* _* */_* */META*
-#
-tee cppo <<_EOF_
-#!/bin/bash
-exec $(type -p cppo) `ocaml src/configure.ml | xargs` "\$@"
-_EOF_
-chmod -v 00755 cppo
-export PATH=$PWD:$PATH
-#
-tee src/_tags <<_EOF_
-<**/*.ml>: pp(cppo)
-<**/*.mli>: pp(cppo)
-_EOF_
-# obs service changes every ^Version line ...
-sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
-OASISFormat: 0.4
-Name:%{name}
-Version: %{version}
-Synopsis:Extended Standard Library for OCaml
-Authors: yg...@autistici.org
-License: %{license}
-Plugins: META(`oasis version`)
-BuildTools: ocamlbuild, cppo
-OCamlVersion: >= 4.03
-AlphaFeatures: ocamlbuild_more_args
-XOCamlbuildPluginTags: package(ocamlbuild_cppo)
-
-Library extlib
- Install: true
- Path: src
- Modules: \
- Base64, \
- BitSet, \
- Dllist, \
- DynArray, \
- Enum, \
- ExtArray, \
- ExtBuffer, \
- ExtBytes, \
- ExtHashtbl, \
- ExtLib, \
- ExtList, \
- ExtString, \
- Global, \
- IO, \
- OptParse, \
- Option, \
- PMap, \
- RefList, \
- Std, \
- UChar, \
- UTF8, \
- Unzip
-
-Document "extlib"
- Title:API reference for extlib
- Type: ocamlbuild
- BuildTools+: ocamldoc
- InstallDir: \$htmldir
- Install: true
- XOCamlbuildPath: .
- XOCamlbuildLibraries: extlib
-
-_EOF_
-
-%oasis_setup
-%ocaml_oasis_configure --enable-docs --enable-tests
-%ocaml_oasis_build
-%ocaml_oasis_doc
+make build doc -j1
%install
-%ocaml_oasis_findlib_install
+export DESTDIR=$RPM_BUILD_ROOT
+export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
+mkdir -p $OCAMLFIND_DESTDIR
+make install -j1
%files
%defattr(-,root,root,-)
-%doc CHANGES LICENSE README.md
+%doc CHANGES README.md
+%license LICENSE
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
%if 0%{?ocaml_native_compiler}
@@ -138,7 +76,8 @@
%files devel
%defattr(-,root,root,-)
-%{oasis_docdir_html}
+%doc CHANGES README.md src/doc/*
+%license
commit ocaml-extlib for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-extlib for openSUSE:Factory
checked in at 2017-08-18 15:01:40
Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-extlib.new (New)
Package is "ocaml-extlib"
Fri Aug 18 15:01:40 2017 rev:4 rq:512524 version:1.7.2
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes
2017-06-08 15:02:59.819075324 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new/ocaml-extlib.changes
2017-08-18 15:01:44.128695735 +0200
@@ -1,0 +2,15 @@
+Tue Jul 25 13:04:54 UTC 2017 - oher...@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+---
+Mon Jul 17 12:48:58 UTC 2017 - oher...@suse.de
+
+- Wrap specfile conditionals to fix quilt setup
+
+---
+Mon Jul 17 10:48:58 UTC 2017 - oher...@suse.de
+
+- Remove autodeps for pre openSUSE 12.1 releases
+
+---
Other differences:
--
++ ocaml-extlib.spec ++
--- /var/tmp/diff_new_pack.7EF4Bo/_old 2017-08-18 15:01:45.068563429 +0200
+++ /var/tmp/diff_new_pack.7EF4Bo/_new 2017-08-18 15:01:45.080561740 +0200
@@ -20,10 +20,10 @@
Name: ocaml-extlib
Version:1.7.2
Release:0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
Summary:OCaml ExtLib additions to the standard library
License:LGPL-2.1+
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Url:https://github.com/ygrek/ocaml-extlib
Source0:extlib-%{version}.tar.gz
BuildRequires: ocaml
@@ -32,12 +32,6 @@
BuildRequires: ocaml-rpm-macros >= 4.03
BuildRequires: ocamlfind(ocamlbuild_cppo)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-extlib
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
-%if 0%{?suse_version} < 1210
-Requires: ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-extlib
%description
ExtLib is a project aiming at providing a complete - yet small -
@@ -49,7 +43,7 @@
%packagedevel
Summary:Development files for %{name}
-Group: Development/Libraries/Other
+Group: Development/Languages/OCaml
Requires: %{name} = %{version}
%descriptiondevel
@@ -138,7 +132,7 @@
%doc CHANGES LICENSE README.md
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmxs
%endif
@@ -147,7 +141,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
commit ocaml-extlib for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-extlib for openSUSE:Factory
checked in at 2017-06-08 15:02:57
Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-extlib.new (New)
Package is "ocaml-extlib"
Thu Jun 8 15:02:57 2017 rev:3 rq:501577 version:1.7.2
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes
2017-05-27 13:19:08.728884867 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new/ocaml-extlib.changes
2017-06-08 15:02:59.819075324 +0200
@@ -1,0 +2,5 @@
+Wed May 31 07:07:33 UTC 2017 - o...@aepfle.de
+
+- Replace tabs with spaces in generated _oasis file
+
+---
Other differences:
--
++ ocaml-extlib.spec ++
--- /var/tmp/diff_new_pack.gS3GJI/_old 2017-06-08 15:03:00.766941552 +0200
+++ /var/tmp/diff_new_pack.gS3GJI/_new 2017-06-08 15:03:00.770940988 +0200
@@ -78,11 +78,11 @@
OASISFormat: 0.4
Name:%{name}
Version: %{version}
+Synopsis:Extended Standard Library for OCaml
Authors: yg...@autistici.org
-License: LGPL-2.1+
+License: %{license}
Plugins: META(`oasis version`)
BuildTools: ocamlbuild, cppo
-Synopsis:Extended Standard Library for OCaml
OCamlVersion: >= 4.03
AlphaFeatures: ocamlbuild_more_args
XOCamlbuildPluginTags: package(ocamlbuild_cppo)
commit ocaml-extlib for openSUSE:Factory
Hello community,
here is the log from the commit of package ocaml-extlib for openSUSE:Factory
checked in at 2017-05-27 13:18:12
Comparing /work/SRC/openSUSE:Factory/ocaml-extlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-extlib.new (New)
Package is "ocaml-extlib"
Sat May 27 13:18:12 2017 rev:2 rq:498053 version:1.7.2
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-extlib/ocaml-extlib.changes
2016-10-19 13:01:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-extlib.new/ocaml-extlib.changes
2017-05-27 13:19:08.728884867 +0200
@@ -1,0 +2,7 @@
+Wed May 17 16:01:12 UTC 2017 - o...@aepfle.de
+
+- Update to version 1.7.2
+- Build with oasis
+- Remove ocaml-extlib-makefile.patch
+
+---
Old:
ocaml-extlib-1.7.0.tar.xz
ocaml-extlib-makefile.patch
New:
extlib-1.7.2.tar.gz
Other differences:
--
++ ocaml-extlib.spec ++
--- /var/tmp/diff_new_pack.e6zVEL/_old 2017-05-27 13:19:09.288805709 +0200
+++ /var/tmp/diff_new_pack.e6zVEL/_new 2017-05-27 13:19:09.292805144 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-extlib
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Andrew Psaltis
#
# All modifications and additions to the file contributed by third parties
@@ -18,21 +18,19 @@
Name: ocaml-extlib
-Version:1.7.0
+Version:1.7.2
Release:0
%{ocaml_preserve_bytecode}
Summary:OCaml ExtLib additions to the standard library
License:LGPL-2.1+
Group: Development/Libraries/Other
Url:https://github.com/ygrek/ocaml-extlib
-Source0:%{name}-%{version}.tar.xz
-Patch0: ocaml-extlib-makefile.patch
-BuildRequires: ocaml >= 3.10.1
-BuildRequires: ocaml-cppo
-BuildRequires: ocaml-findlib
-BuildRequires: ocamlfind(bytes)
+Source0:extlib-%{version}.tar.gz
+BuildRequires: ocaml
+BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 4.02.1
+BuildRequires: ocaml-rpm-macros >= 4.03
+BuildRequires: ocamlfind(ocamlbuild_cppo)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# ocaml autodep start for pkg: ocaml-extlib
# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml()
provides/requires
@@ -59,25 +57,85 @@
developing applications that use %{name}.
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n extlib-%{version}
%build
-make -C src all
-%if %{ocaml_native_compiler}
-make -C src opt cmxs
-%endif
+rm -fv setup.ml myocamlbuild.ml META* _* */_* */META*
+#
+tee cppo <<_EOF_
+#!/bin/bash
+exec $(type -p cppo) `ocaml src/configure.ml | xargs` "\$@"
+_EOF_
+chmod -v 00755 cppo
+export PATH=$PWD:$PATH
+#
+tee src/_tags <<_EOF_
+<**/*.ml>: pp(cppo)
+<**/*.mli>: pp(cppo)
+_EOF_
+# obs service changes every ^Version line ...
+sh -c "sed 's/^Version.*/Version: %{version}/' | tee _oasis" <<_EOF_
+OASISFormat: 0.4
+Name:%{name}
+Version: %{version}
+Authors: yg...@autistici.org
+License: LGPL-2.1+
+Plugins: META(`oasis version`)
+BuildTools: ocamlbuild, cppo
+Synopsis:Extended Standard Library for OCaml
+OCamlVersion: >= 4.03
+AlphaFeatures: ocamlbuild_more_args
+XOCamlbuildPluginTags: package(ocamlbuild_cppo)
+
+Library extlib
+ Install: true
+ Path: src
+ Modules: \
+ Base64, \
+ BitSet, \
+ Dllist, \
+ DynArray, \
+ Enum, \
+ ExtArray, \
+ ExtBuffer, \
+ ExtBytes, \
+ ExtHashtbl, \
+ ExtLib, \
+ ExtList, \
+ ExtString, \
+ Global, \
+ IO, \
+ OptParse, \
+ Option, \
+ PMap, \
+ RefList, \
+ Std, \
+ UChar, \
+ UTF8, \
+ Unzip
+
+Document "extlib"
+ Title:API reference for extlib
+ Type: ocamlbuild
+ BuildTools+: ocamldoc
+ InstallDir: \$htmldir
+ Install: true
+ XOCamlbuildPath: .
+ XOCamlbuildLibraries: extlib
+
+_EOF_
+
+%oasis_setup
+%ocaml_oasis_configure --enable-docs --enable-tests
+%ocaml_oasis_build
+%ocaml_oasis_doc
%install
-d="$RPM_BUILD_ROOT`ocamlfind printconf destdir`"
-mkdir -vp $d
-env \
-OCAMLFIND_DESTDIR=$d \
-make install
+%ocaml_oasis_findlib_install
