- Require current dune macros

- Use _service file
- Remove obsolete calendar-2.04-enable-debug.patch and
  ocaml-calendar-buildcompare.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-calendar?expand=0&rev=18

_service

@@ -0,0 +1,15 @@
+<services>
+  <service name="tar_scm" mode="disabled">
+    <param name="url">https://github.com/anuragsoni/calendar.git</param>
+    <param name="scm">git</param>
+    <param name="versionformat">2.04</param>
+    <!-- 1.6 -->
+    <param name="revision">pervasives-deprecated-408</param>
+    <param name="filename">ocaml-calendar</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>

calendar-2.04-enable-debug.patch

@@ -1,11 +0,0 @@
---- calendar-2.04/Makefile.in.old	2013-09-14 16:15:43.760253519 +0100
-+++ calendar-2.04/Makefile.in	2013-09-14 16:16:03.233279962 +0100
-@@ -86,7 +86,7 @@
- 
- CAMLIBS	= $(addprefix -I , $(DIRS))
- 
--CAMLFLAGS= $(CAMLIBS)
-+CAMLFLAGS= -g $(CAMLIBS)
- BYTEFLAGS= $(CAMLFLAGS)
- LINK_OPTFLAGS = $(CAMLFLAGS) -noassert
- OPTFLAGS = $(LINK_OPTFLAGS) -for-pack CalendarLib

calendar-2.04.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bea6faa0337a1c54b0f3c2b9b45c9eb90e2b2747406e6f0b841e1fd20fd4d9f7
-size 271522

ocaml-calendar-2.04.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48db0ea40ae83fca502435f71eb2276e9c21e945e18bb697e5b84578ef31cae6
+size 76496

ocaml-calendar-buildcompare.patch

@@ -1,15 +0,0 @@
----
- Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -117,7 +117,7 @@ $(LIBDIR)/$(NAMELIB).cmxs: $(LIBDIR)/$(N
- 
- src/version.ml: Makefile
- 	echo "let version = \"$(VERSION)\"" > $@
--	echo "let date = \"`date`\"" >> $@
-+	echo "let date = \"`date --reference=CHANGES`\"" >> $@
- 
- META: Makefile
- 	echo "name = \"$(NAME)\"" > $@

ocaml-calendar.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  1 12:34:56 UTC 2019 - ohering@suse.de
+
+- Require current dune macros
+- Use _service file
+- Remove obsolete calendar-2.04-enable-debug.patch and
+  ocaml-calendar-buildcompare.patch
+
 -------------------------------------------------------------------
 Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
 

ocaml-calendar.spec

@@ -12,15 +12,10 @@
 # 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/
 #
 
 
-# Ignore all generated modules *except* CalendarLib, since everything
-# now appears in that namespace.
-%global __ocaml_requires_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version
-%global __ocaml_provides_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version
-
 Name:           ocaml-calendar
 Version:        2.04
 Release:        0
@@ -28,16 +23,14 @@ Release:        0
 Summary:        Objective Caml library for managing dates and times
 License:        LGPL-2.0
 Group:          Development/Languages/OCaml
-Url:            http://calendar.forge.ocamlcore.org/
+Url:            https://github.com/ocaml-community/calendar
-Source0:        http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
+Source0:        %{name}-%{version}.tar.xz
-Patch1:         calendar-2.04-enable-debug.patch
+BuildRequires:  ocaml
-Patch2:         ocaml-calendar-buildcompare.patch
+BuildRequires:  ocaml-dune
-BuildRequires:  gawk
+BuildRequires:  ocaml-rpm-macros >= 20191101
-BuildRequires:  ocaml >= 4.00.1
+BuildRequires:  ocamlfind(alcotest)
-BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
+BuildRequires:  ocamlfind(re)
-BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocamlfind(unix)
-BuildRequires:  ocaml-rpm-macros >= 4.02.1
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Objective Caml library for managing dates and times.
@@ -52,48 +45,22 @@ The %{name}-devel package contains libraries and signature files for
 developing applications that use %{name}.
 
 %prep
-%setup -q -n calendar-%{version}
+%autosetup -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-./configure --libdir=%{_libdir}
+dune_release_pkgs='calendar'
-make %{?_smp_mflags}
+%ocaml_dune_setup
-make %{?_smp_mflags} doc
+%ocaml_dune_build
-
-mv TODO TODO.old
-iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO
 
 %install
-export DESTDIR=%{buildroot}
+%ocaml_dune_install
-export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
+%ocaml_create_file_list
-mkdir -p $OCAMLFIND_DESTDIR
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-%files
+%check
-%defattr(-,root,root,-)
+%ocaml_dune_test
-%doc CHANGES README TODO LGPL COPYING
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.cmxs
-%endif
 
-%files devel
+%files -f %{name}.files
-%defattr(-,root,root,-)
+
-%doc CHANGES README TODO LGPL COPYING doc/*
+%files devel -f %{name}.files.devel
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%if 0%{?ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmx
-%{_libdir}/ocaml/*/*.cmxa
-%{_libdir}/ocaml/*/*.o
-%endif
-%{_libdir}/ocaml/*/*.cma
-%{_libdir}/ocaml/*/*.cmi
-%{_libdir}/ocaml/*/*.cmo
-%{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/*/META
 
 %changelog