diff --git a/_service b/_service index e6dac84..dc41c04 100644 --- a/_service +++ b/_service @@ -1,13 +1,13 @@ - .depend .github .gitignore - .travis.yml - Dockerfile + CONTRIBUTING.md INSTALL.md LICENSE + NEWS.md README.md + dune-project icons/.xvpics icons/U.16x16x16m.png icons/U.24x24x16m.png @@ -18,42 +18,42 @@ icons/U.32x32x256.xpm icons/U.48x48x16m.png icons/U.ico + icons/Unison.gif icons/Unison.xpm icons/success.gif icons/svg_to_data.ml icons/unison-icon.ai icons/unison-logo.gif icons/unison.haruo.jpg - setup - src/CONTRIB + icons/unison.png + icons/unison.svg src/FEATURES.md - src/INSTALL.gtk2 - src/INSTALL.win32-cygwin-gnuc - src/INSTALL.win32-msvc - src/INSTALL.win32 - src/INSTALL src/README src/ROADMAP.txt src/TODO.txt - src/fsmonitor.py - src/fsmonitor/linux/Makefile + src/dune + src/fsmonitor/dune + src/fsmonitor/inotify/dune src/fsmonitor/solaris src/fsmonitor/windows - src/lwt/META - src/lwt/depend - src/lwt/example - src/lwt/win + src/lwt/dune + src/lwt/win/dune + src/lwt/win/lwt_win.ml + src/lwt/win/lwt_win.mli + src/system/system_win.ml src/system/system_win_stubs.c src/system/win - src/ubase/META + src/test.mli + src/ubase/dune src/uimac + src/uimacbridge.ml src/unison.hgr src/win32rc - src/winmain.c - tests unicode_utils + unison-gui.opam + unison.opam unison - 574a2716a9cd5096651d80f161250bf26df9a38f + f6e8bea5d9e5a5282904fdf644ed4d7ee9b9b2ad git disable https://github.com/bcpierce00/unison.git diff --git a/unison-2.53.3.tar.xz b/unison-2.53.3.tar.xz deleted file mode 100644 index b5b0284..0000000 --- a/unison-2.53.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c12c6a73345415ed1cf21b0d6f0213cfb42e3777beca5221fd1849398c1125b -size 435652 diff --git a/unison-2.53.4.tar.xz b/unison-2.53.4.tar.xz new file mode 100644 index 0000000..f30c9d8 --- /dev/null +++ b/unison-2.53.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1d6cfc5a89f9a7d71ae153bb5d7722d207a3691893e2b602e61a24a810bfe0d +size 389860 diff --git a/unison.changes b/unison.changes index 6a224bb..8b2ba66 100644 --- a/unison.changes +++ b/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 diff --git a/unison.spec b/unison.spec index 2aa2809..a9cfacc 100644 --- a/unison.spec +++ b/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-latex +BuildRequires: texlive-collection-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' -%ocaml_dune_setup -%ocaml_dune_build +%make_build PREFIX=%_prefix %endif %install %if "%build_flavor" == "doc" -mkdir -vp %buildroot%_mandir/man1 -cp -avt %buildroot%_mandir/man1 man/%pkg.1 -echo '%%_mandir/man1/unison.*' > files +echo '%%dir %_defaultdocdir/%pkg' > 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 -%ocaml_create_file_list -rm -rfv %buildroot%ocaml_standard_library +%make_install PREFIX=%_prefix 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