Accepting request 1148334 from devel:languages:ocaml

- Update to version 2.53.4
  * Preferences "force", "prefer" and related "partial" preferences now
    work slightly differently with values "newer" and "older". Previously,
    if mtimes in both replicas were equal then always the second root
    propagated to the first root (possibly reverting user changes). It
    is now made explicit that "newer" and "older" only work when mtimes
    are different.
  * Bugfixes, minor improvements, cleanups.

OBS-URL: https://build.opensuse.org/request/show/1148334
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unison?expand=0&rev=47

_service

@@ -1,13 +1,13 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="exclude">.depend</param>
     <param name="exclude">.github</param>
     <param name="exclude">.gitignore</param>
-    <param name="exclude">.travis.yml</param>
+    <param name="exclude">CONTRIBUTING.md</param>
-    <param name="exclude">Dockerfile</param>
     <param name="exclude">INSTALL.md</param>
     <param name="exclude">LICENSE</param>
+    <param name="exclude">NEWS.md</param>
     <param name="exclude">README.md</param>
+    <param name="exclude">dune-project</param>
     <param name="exclude">icons/.xvpics</param>
     <param name="exclude">icons/U.16x16x16m.png</param>
     <param name="exclude">icons/U.24x24x16m.png</param>
@@ -18,42 +18,42 @@
     <param name="exclude">icons/U.32x32x256.xpm</param>
     <param name="exclude">icons/U.48x48x16m.png</param>
     <param name="exclude">icons/U.ico</param>
+    <param name="exclude">icons/Unison.gif</param>
     <param name="exclude">icons/Unison.xpm</param>
     <param name="exclude">icons/success.gif</param>
     <param name="exclude">icons/svg_to_data.ml</param>
     <param name="exclude">icons/unison-icon.ai</param>
     <param name="exclude">icons/unison-logo.gif</param>
     <param name="exclude">icons/unison.haruo.jpg</param>
-    <param name="exclude">setup</param>
+    <param name="exclude">icons/unison.png</param>
-    <param name="exclude">src/CONTRIB</param>
+    <param name="exclude">icons/unison.svg</param>
     <param name="exclude">src/FEATURES.md</param>
-    <param name="exclude">src/INSTALL.gtk2</param>
-    <param name="exclude">src/INSTALL.win32-cygwin-gnuc</param>
-    <param name="exclude">src/INSTALL.win32-msvc</param>
-    <param name="exclude">src/INSTALL.win32</param>
-    <param name="exclude">src/INSTALL</param>
     <param name="exclude">src/README</param>
     <param name="exclude">src/ROADMAP.txt</param>
     <param name="exclude">src/TODO.txt</param>
-    <param name="exclude">src/fsmonitor.py</param>
+    <param name="exclude">src/dune</param>
-    <param name="exclude">src/fsmonitor/linux/Makefile</param>
+    <param name="exclude">src/fsmonitor/dune</param>
+    <param name="exclude">src/fsmonitor/inotify/dune</param>
     <param name="exclude">src/fsmonitor/solaris</param>
     <param name="exclude">src/fsmonitor/windows</param>
-    <param name="exclude">src/lwt/META</param>
+    <param name="exclude">src/lwt/dune</param>
-    <param name="exclude">src/lwt/depend</param>
+    <param name="exclude">src/lwt/win/dune</param>
-    <param name="exclude">src/lwt/example</param>
+    <param name="exclude">src/lwt/win/lwt_win.ml</param>
-    <param name="exclude">src/lwt/win</param>
+    <param name="exclude">src/lwt/win/lwt_win.mli</param>
+    <param name="exclude">src/system/system_win.ml</param>
     <param name="exclude">src/system/system_win_stubs.c</param>
     <param name="exclude">src/system/win</param>
-    <param name="exclude">src/ubase/META</param>
+    <param name="exclude">src/test.mli</param>
+    <param name="exclude">src/ubase/dune</param>
     <param name="exclude">src/uimac</param>
+    <param name="exclude">src/uimacbridge.ml</param>
     <param name="exclude">src/unison.hgr</param>
     <param name="exclude">src/win32rc</param>
-    <param name="exclude">src/winmain.c</param>
-    <param name="exclude">tests</param>
     <param name="exclude">unicode_utils</param>
+    <param name="exclude">unison-gui.opam</param>
+    <param name="exclude">unison.opam</param>
     <param name="filename">unison</param>
-    <param name="revision">574a2716a9cd5096651d80f161250bf26df9a38f</param>
+    <param name="revision">f6e8bea5d9e5a5282904fdf644ed4d7ee9b9b2ad</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/bcpierce00/unison.git</param>

unison-2.53.3.tar.xz

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

unison-2.53.4.tar.xz

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

unison.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb 20 20:20:20 UTC 2024 - ohering@suse.de
+
+- Update to version 2.53.4
+  * Preferences "force", "prefer" and related "partial" preferences now
+    work slightly differently with values "newer" and "older". Previously,
+    if mtimes in both replicas were equal then always the second root
+    propagated to the first root (possibly reverting user changes). It
+    is now made explicit that "newer" and "older" only work when mtimes
+    are different.
+  * Bugfixes, minor improvements, cleanups.
+
 -------------------------------------------------------------------
 Fri Jul  7 07:07:07 UTC 2023 - ohering@suse.de
 

unison.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package unison
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
 
 %define     pkg unison
 Name:           %pkg%nsuffix
-Version:        2.53.3
+Version:        2.53.4
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        File synchronization tool
@@ -35,16 +35,15 @@ URL:            https://github.com/bcpierce00/unison
 Source0:        %pkg-%version.tar.xz
 Source1:        %pkg.desktop
 BuildRequires:  ocaml(ocaml_base_version) >= 4.08
-BuildRequires:  ocaml-rpm-macros >= 20230101
+BuildRequires:  ocaml-rpm-macros >= 20231101
 %if "%build_flavor" == "doc"
 %if 0%?suse_version > 1500 || 0%?sle_version > 150300
 BuildRequires:  hevea
 BuildRequires:  lynx
 %endif
-BuildRequires:  texlive-dvips
+BuildRequires:  texlive-collection-latex
-BuildRequires:  texlive-latex
+BuildRequires:  texlive-metafont
 %else
-BuildRequires:  ocaml-dune >= 2.3
 BuildRequires:  ocamlfind(lablgtk3)
 BuildRequires:  pkgconfig(ncursesw)
 %if 0%{?suse_version} > 0
@@ -79,32 +78,25 @@ replica to the other.
 
 %build
 %if "%build_flavor" == "doc"
-%make_build docs -j1
+%make_build docs
 ls -lart doc man
 %else
-dune_release_pkgs='unison,unison-gui,unison-fsmonitor'
+%make_build PREFIX=%_prefix
-%ocaml_dune_setup
-%ocaml_dune_build
 %endif
 
 %install
 %if "%build_flavor" == "doc"
-mkdir -vp %buildroot%_mandir/man1
+echo '%%dir %_defaultdocdir/%pkg' > files
-cp -avt %buildroot%_mandir/man1 man/%pkg.1
-echo '%%_mandir/man1/unison.*' > files
 for ext in html pdf
 do
   test -f doc/unison-manual.$ext || continue
   mkdir -vp %buildroot%_defaultdocdir/%pkg
   cp doc/unison-manual.$ext %buildroot%_defaultdocdir/%pkg
-  echo '%%dir %_defaultdocdir/%pkg' >> files
   echo "%%doc %_defaultdocdir/%pkg/unison-manual.$ext" >> files
 done
 %else
 echo '%%doc src/COPYING' > files
-%ocaml_dune_install
+%make_install PREFIX=%_prefix
-%ocaml_create_file_list
-rm -rfv %buildroot%ocaml_standard_library
 
 mv %buildroot%_bindir/%name %buildroot%_bindir/%name-text
 mv %buildroot%_bindir/%name-gui %buildroot%_bindir/%name
@@ -123,10 +115,10 @@ install -m 644 -D %{SOURCE1} %buildroot/%_datadir/applications/%name.desktop
 %_datadir/pixmaps/*
 %_bindir/%name
 %_bindir/%name-fsmonitor
+%_mandir/man1/*
 
 %files text
 %defattr(-,root,root,-)
-%doc src/COPYING
 %_bindir/%name-text
 %endif