diff --git a/_service b/_service index dc41c04..d5abe14 100644 --- a/_service +++ b/_service @@ -53,7 +53,7 @@ unison-gui.opam unison.opam unison - f6e8bea5d9e5a5282904fdf644ed4d7ee9b9b2ad + 060f54b0ec95e26df8725d699ef7b4cab23e0d68 git disable https://github.com/bcpierce00/unison.git diff --git a/unison-2.53.4.tar.xz b/unison-2.53.4.tar.xz deleted file mode 100644 index f30c9d8..0000000 --- a/unison-2.53.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1d6cfc5a89f9a7d71ae153bb5d7722d207a3691893e2b602e61a24a810bfe0d -size 389860 diff --git a/unison-2.53.5.tar.xz b/unison-2.53.5.tar.xz new file mode 100644 index 0000000..146ad6a --- /dev/null +++ b/unison-2.53.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f4f39078e7669bfe95ad18e38d6818b42af0f6e62cdc3b587de92ad85dd6c50 +size 390452 diff --git a/unison.changes b/unison.changes index 8b2ba66..7689889 100644 --- a/unison.changes +++ b/unison.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 7 07:07:07 UTC 2024 - ohering@suse.de + +- Update to version 2.53.5 + * Various minor bugfixes. + * Recovery from errors during repeat mode (enabled in 2.53.1) + is disabled for time being. + ------------------------------------------------------------------- Tue Feb 20 20:20:20 UTC 2024 - ohering@suse.de diff --git a/unison.spec b/unison.spec index a9cfacc..338fb81 100644 --- a/unison.spec +++ b/unison.spec @@ -24,7 +24,7 @@ %define pkg unison Name: %pkg%nsuffix -Version: 2.53.4 +Version: 2.53.5 Release: 0 %{?ocaml_preserve_bytecode} Summary: File synchronization tool @@ -37,10 +37,8 @@ Source1: %pkg.desktop BuildRequires: ocaml(ocaml_base_version) >= 4.08 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-collection-latex BuildRequires: texlive-metafont %else @@ -79,7 +77,6 @@ replica to the other. %build %if "%build_flavor" == "doc" %make_build docs -ls -lart doc man %else %make_build PREFIX=%_prefix %endif @@ -95,7 +92,21 @@ do echo "%%doc %_defaultdocdir/%pkg/unison-manual.$ext" >> files done %else -echo '%%doc src/COPYING' > files +# The presence of _defaultlicensedir is no inidicator for a usable %%license macro +# If it is defined, but rpm is still too old, it will default to the last License: line. +if bash -x -c 'read a b c < <(rpm --version) +set -- ${c//./ } +test $1 -lt 4 && exit 1 +if test $1 -eq 4 && test $2 -lt 14 +then + exit 1 +fi +exit 0' +then + echo '%%license src/COPYING' > files +else + echo '%%doc src/COPYING' > files +fi %make_install PREFIX=%_prefix mv %buildroot%_bindir/%name %buildroot%_bindir/%name-text