diff --git a/unison-2.48.3.tar.gz b/unison-2.48.3.tar.gz deleted file mode 100644 index a47dbe2..0000000 --- a/unison-2.48.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 -size 1172646 diff --git a/unison-2.48.3-manual.html b/unison-2.48.4-manual.html similarity index 99% rename from unison-2.48.3-manual.html rename to unison-2.48.4-manual.html index 5505f4e..d167013 100644 --- a/unison-2.48.3-manual.html +++ b/unison-2.48.4-manual.html @@ -36,8 +36,8 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
Unison File Synchronizer
User Manual and Reference Guide
-Version 2.48.3
-Copyright 1998-2015, Benjamin C. Pierce +Version 2.48.4
+Copyright 1998-2012, Benjamin C. Pierce


@@ -105,7 +105,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;} Installing Ssh
          •Unix
          •Windows
-Changes in Version 2.48.3
+Changes in Version 2.48.4
@@ -387,15 +387,8 @@ Solaris, Linux, FreeBSD), and on both 32- and 64-bit architectures.

Unix

-Unison can be built with or without a graphical user interface (GUI). The -build system will decide automatically depending on the libraries installed -on your system, but you can also type make UISTYLE=text to build -Unison without GUI.
-
-You'll need the Objective Caml compiler, -available from http://caml.inria.fr. OCaml is available from most -package managers -Building and installing OCaml +You'll need the Objective Caml compiler (version 3.11.2 or later), which is +available from http://caml.inria.fr. Building and installing OCaml on Unix systems is very straightforward; just follow the instructions in the distribution. You'll probably want to build the native-code compiler in addition to the bytecode compiler, as Unison runs much faster when compiled @@ -410,30 +403,39 @@ GNU version.) Unison's build system is not parallelizable, so don't use make flags which cause it to start processes in parallel, e.g. -j for GNU make.

-Once you've got OCaml installed, grab a copy of the Unison sources, unzip -and untar them, change to the new unison directory, and type “make UISTYLE=text”. The result should be an executable file called -unison. Type ./unison to make sure the program is -executable. You should get back a usage message.
+Once you've got OCaml installed, grab a copy of the Unison sources, +unzip and untar them, change to the new unison directory, and +type “make UISTYLE=text”. +The result should be an executable file called unison. +Type ./unison to make sure the program is executable. You +should get back a usage message.

If you want to build the graphical user interface, you will need to install -some additional things: +two additional things: -Type make to build Unison. If Gtk2 is available on the system, Unison -with a GUI will be built automatically.
+The Gtk2 libraries. These areavailable from + http://www.gtk.org and are standard on many Unix installations.

-Put the unison executable somewhere in your search path, either by -adding the Unison directory to your PATH variable or by copying the -executable to some standard directory where executables are stored. Or just -type make install to install Unison to $HOME/bin/unison.
+
  • The lablgtk2 OCaml library. Grab the + developers' tarball from +
    + http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html, +
    + untar it, and follow the instructions to build and install it.
    +
    +(Quick start: make configure, then make, then make + opt, then su and make install.) + +Now build unison. If your search paths are set up correctly, simply typing +make +again should build a unison executable with a Gtk2 graphical +interface. (In previous releases of Unison, it was necessary to add UISTYLE=gtk2 to the 'make' command above. This requirement has been +removed: the makefile should detect automatically when lablgtk2 is +present and set this flag automatically.)
    +
    +Put the unison executable somewhere in your search path, either +by adding the Unison directory to your PATH variable or by copying the +executable to some standard directory where executables are stored.

    @@ -2782,9 +2784,9 @@ you have trouble, you might try other ones instead: hosts, provide your remote user name when providing the remote root (i.e., //username@host/path...). -
    +
    -

    Changes in Version 2.48.3

    +

    Changes in Version 2.48.4

    Changes since 2.45:
    • diff --git a/unison-2.48.4.tar.gz b/unison-2.48.4.tar.gz new file mode 100644 index 0000000..be2771f --- /dev/null +++ b/unison-2.48.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 +size 1200861 diff --git a/unison-ocaml-4.03.patch b/unison-ocaml-4.03.patch deleted file mode 100644 index 57e9c3a..0000000 --- a/unison-ocaml-4.03.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/bcpierce00/unison/commit/4473822b5aa6de3e849ca6c958b365a71edbca4f ---- - system/system_generic.ml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/system/system_generic.ml -+++ b/system/system_generic.ml -@@ -57,7 +57,7 @@ let opendir f = - let readdir = Unix.readdir - let closedir = Unix.closedir - let readlink = Unix.readlink --let symlink = Unix.symlink -+let symlink s1 s2 = Unix.symlink s1 s2 - let chdir = Sys.chdir - let getcwd = Sys.getcwd - diff --git a/unison.changes b/unison.changes index be4890f..54c8791 100644 --- a/unison.changes +++ b/unison.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Nov 13 07:13:47 UTC 2017 - okurz@suse.com + +- Update to 2.48.4 + * Fix build for OCaml 4.03 + (and add Makefile improvements for exporting under git) + * Better reporting for OCaml compiler version mismatch +- drop patch unison-ocaml-4.03.patch: Change included in upstream sources + ------------------------------------------------------------------- Mon Jul 17 12:48:58 UTC 2017 - olaf@aepfle.de diff --git a/unison.spec b/unison.spec index 28ec15b..0c39e47 100644 --- a/unison.spec +++ b/unison.spec @@ -1,7 +1,7 @@ # # spec file for package unison # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: unison -Version: 2.48.3 +Version: 2.48.4 Release: 0 %{?ocaml_preserve_bytecode} Summary: File synchronization tool @@ -28,7 +28,6 @@ Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stab Source1: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html Source2: %{name}.desktop Source3: %{name}.png -Patch0: unison-ocaml-4.03.patch BuildRequires: gtk2-devel BuildRequires: ncurses-devel BuildRequires: ocaml-lablgtk2-devel @@ -44,8 +43,7 @@ separately, then brought up to date by propagating the changes in each replica to the other. %prep -%setup -q -%patch0 -p1 +%setup -qn src %build # This package failed when testing with -Wl,-as-needed being default.