Hello community, here is the log from the commit of package ocaml-calendar for openSUSE:Factory checked in at 2019-11-27 13:52:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-calendar (Old) and /work/SRC/openSUSE:Factory/.ocaml-calendar.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-calendar" Wed Nov 27 13:52:54 2019 rev:3 rq:748357 version:2.04 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-calendar/ocaml-calendar.changes 2017-08-18 15:01:19.356182991 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-calendar.new.26869/ocaml-calendar.changes 2019-11-27 13:53:04.768383177 +0100 @@ -1,0 +2,8 @@ +Fri Nov 1 12:34:56 UTC 2019 - [email protected] + +- Require current dune macros +- Use _service file +- Remove obsolete calendar-2.04-enable-debug.patch and + ocaml-calendar-buildcompare.patch + +------------------------------------------------------------------- Old: ---- calendar-2.04-enable-debug.patch calendar-2.04.tar.gz ocaml-calendar-buildcompare.patch New: ---- _service ocaml-calendar-2.04.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-calendar.spec ++++++ --- /var/tmp/diff_new_pack.d6yrJm/_old 2019-11-27 13:53:05.408382646 +0100 +++ /var/tmp/diff_new_pack.d6yrJm/_new 2019-11-27 13:53:05.408382646 +0100 @@ -12,15 +12,11 @@ # 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 - +%bcond_with ocaml_do_dune_runtest Name: ocaml-calendar Version: 2.04 Release: 0 @@ -28,16 +24,16 @@ Summary: Objective Caml library for managing dates and times License: LGPL-2.0 Group: Development/Languages/OCaml -Url: http://calendar.forge.ocamlcore.org/ -Source0: http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz -Patch1: calendar-2.04-enable-debug.patch -Patch2: ocaml-calendar-buildcompare.patch -BuildRequires: gawk -BuildRequires: ocaml >= 4.00.1 -BuildRequires: ocaml-findlib-devel >= 1.3.3-3 -BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: https://github.com/ocaml-community/calendar +Source0: %{name}-%{version}.tar.xz +BuildRequires: ocaml +BuildRequires: ocaml-dune +BuildRequires: ocaml-rpm-macros >= 20191101 +BuildRequires: ocamlfind(re) +BuildRequires: ocamlfind(unix) +%if %{with ocaml_do_dune_runtest} +BuildRequires: ocamlfind(alcotest) +%endif %description Objective Caml library for managing dates and times. @@ -52,48 +48,26 @@ developing applications that use %{name}. %prep -%setup -q -n calendar-%{version} -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build -./configure --libdir=%{_libdir} -make %{?_smp_mflags} -make %{?_smp_mflags} doc - -mv TODO TODO.old -iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO +sed -i~ '/system date/d' src/dune +diff -u "$_"~ "$_" && exit 1 +dune_release_pkgs='calendar' +%ocaml_dune_setup +%ocaml_dune_build %install -export DESTDIR=%{buildroot} -export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml -mkdir -p $OCAMLFIND_DESTDIR -make DESTDIR=%{buildroot} install %{?_smp_mflags} - -%files -%defattr(-,root,root,-) -%doc CHANGES README TODO LGPL COPYING -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%endif +%ocaml_dune_install +%ocaml_create_file_list -%files devel -%defattr(-,root,root,-) -%doc CHANGES README TODO LGPL COPYING doc/* -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.a -%{_libdir}/ocaml/*/*.cmx -%{_libdir}/ocaml/*/*.cmxa -%{_libdir}/ocaml/*/*.o +%if %{with ocaml_do_dune_runtest} +%check +%ocaml_dune_test %endif -%{_libdir}/ocaml/*/*.cma -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/*.cmo -%{_libdir}/ocaml/*/*.mli -%{_libdir}/ocaml/*/META + +%files -f %{name}.files + +%files devel -f %{name}.files.devel %changelog ++++++ _service ++++++ <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>
