- up to 0.6.3

diff --git a/no-stdlib-shims.patch b/no-stdlib-shims.patch
new file mode 100644 (file)
index 0000000..4485a6b
--- /dev/null
+++ b/no-stdlib-shims.patch
@@ -0,0 +1,18 @@
+--- ocaml-fileutils-0.6.3/fileutils.opam~      2020-07-11 23:21:55.000000000 +0200
++++ ocaml-fileutils-0.6.3/fileutils.opam       2021-03-30 21:57:08.685770245 +0200
+@@ -16,7 +16,6 @@
+   "ocaml" {>= "4.03"}
+   "base-unix"
+   "base-bytes"
+-  "stdlib-shims"
+   "dune" {>= "1.11.0"}
+   "ounit" {with-test & >= "2.0.0"}
+ ]
+--- ocaml-fileutils-0.6.3/src/lib/fileutils/dune~      2020-07-11 23:21:55.000000000 +0200
++++ ocaml-fileutils-0.6.3/src/lib/fileutils/dune       2021-03-30 21:57:45.986277768 +0200
+@@ -30,4 +30,4 @@
+     fileUtilWHICH
+     unixPath
+     win32Path)
+-  (libraries unix bytes stdlib-shims))
++  (libraries unix bytes))

diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec
index 91e2cce6429f65166adf2613fac10ab794940c14..472c18c45c0ebaeaa56eb65f743395ffca2ed4e3 100644 (file)
--- a/ocaml-fileutils.spec
+++ b/ocaml-fileutils.spec
@@ -5,19 +5,22 @@
 %ifnarch %{ix86} %{x8664} %{arm} aarch64 ppc sparc sparcv9
 %undefine      with_ocaml_opt
 %endif
+
+%define                _enable_debug_packages  0
+
 Summary:       OCaml functions to manipulate real file (POSIX like) and filename
 Summary(pl.UTF-8):     Funkcje OCamla do operacji na (posiksowych) plikach oraz nazwach plików
 Name:          ocaml-fileutils
-Version:       0.5.2
+Version:       0.6.3
 Release:       1
 License:       LGPL v2.1+ with OCaml linking exception
 Group:         Libraries
-Source0:       http://forge.ocamlcore.org/frs/download.php/1695/%{name}-%{version}.tar.gz
-# Source0-md5: ea653868e5e7a4a9316f7338b971df62
+Source0:       https://github.com/gildor478/ocaml-fileutils/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: e6740a32ea1272d54c738d390dab000c
+Patch0:                no-stdlib-shims.patch
 URL:           http://forge.ocamlcore.org/projects/ocaml-fileutils
 BuildRequires: ocaml >= 3.04-7
 BuildRequires: ocaml-findlib
-BuildRequires: ocaml-ounit
 %requires_eq   ocaml-runtime
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,7 +35,7 @@ Summary:      Development files for OCaml fileutils package
 Summary(pl.UTF-8):     Pliki programistyczne pakietu fileutils dla OCamla
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-%requires_eq   ocaml
+%requires_eq ocaml
 
 %description devel
 This package contains libraries and signature files for developing
@@ -44,41 +47,29 @@ wykorzystujących pakiet OCamla fileutils.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-# note: not autoconf configure
-./configure \
-       --prefix=%{_prefix} \
-       --docdir=$(pwd)/doc \
-       --override bytecomp_c_compiler "%{__cc} %{rpmcflags} -D_FILE_OFFSET_BITS=64 -D_REENTRANT -fPIC" \
-       --override native_c_compiler "%{__cc} %{rpmcflags} -D_FILE_OFFSET_BITS=64 -D_REENTRANT"
-
-%{__make} all
+dune build --verbose
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/ocaml/{site-lib/fileutils,stublibs}
 
-%{__make} install \
-       OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
-
-%{__mv} $RPM_BUILD_ROOT%{_libdir}/ocaml/fileutils/META $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/fileutils
-cat >> $RPM_BUILD_ROOT%{_libdir}/ocaml/site-lib/fileutils/META <<EOF
-directory = "+fileutils"
-EOF
-
-# for debugging?
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/fileutils/*.{annot,cmt,cmti}
+dune install --destdir=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS.txt CHANGELOG.txt README.txt TODO.txt
+%doc CHANGES.md README.md
 %dir %{_libdir}/ocaml/fileutils
+%{_libdir}/ocaml/fileutils/META
+%dir %{_libdir}/ocaml/fileutils/str
 %if %{with ocaml_opt}
 %attr(755,root,root) %{_libdir}/ocaml/fileutils/fileutils*.cmxs
+%attr(755,root,root) %{_libdir}/ocaml/fileutils/str/*.cmxs
 %endif
 %{_libdir}/ocaml/fileutils/fileutils*.cma
 %{_libdir}/ocaml/site-lib/fileutils
@@ -86,12 +77,20 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/ocaml/fileutils/*.cmi
+%{_libdir}/ocaml/fileutils/*.cmt
+%{_libdir}/ocaml/fileutils/*.cmti
+%{_libdir}/ocaml/fileutils/*.mli
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/fileutils/*.cmx
 %{_libdir}/ocaml/fileutils/fileutils*.a
 %{_libdir}/ocaml/fileutils/fileutils*.cmxa
+%{_libdir}/ocaml/fileutils/str/*.cmx
+%{_libdir}/ocaml/fileutils/str/*.a
+%{_libdir}/ocaml/fileutils/str/*.cmxa
 %endif
-# doc?
-%{_libdir}/ocaml/fileutils/FilePath.mli
-%{_libdir}/ocaml/fileutils/FileUtil.mli
-%{_libdir}/ocaml/fileutils/FileUtil*.ml
+%{_libdir}/ocaml/fileutils/dune-package
+%{_libdir}/ocaml/fileutils/opam
+%{_libdir}/ocaml/fileutils/.private
+%{_libdir}/ocaml/fileutils/str/*.cmi
+%{_libdir}/ocaml/fileutils/str/*.cmt
+%{_libdir}/ocaml/fileutils/str/*.cma