Hello community, here is the log from the commit of package unison for openSUSE:Factory checked in at 2017-11-23 09:43:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unison (Old) and /work/SRC/openSUSE:Factory/.unison.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unison" Thu Nov 23 09:43:47 2017 rev:36 rq:544309 version:2.48.4 Changes: -------- --- /work/SRC/openSUSE:Factory/unison/unison.changes 2017-10-11 23:03:12.524025030 +0200 +++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes 2017-11-23 09:43:49.073819605 +0100 @@ -1,0 +2,9 @@ +Mon Nov 13 07:13:47 UTC 2017 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- unison-2.48.3-manual.html unison-2.48.3.tar.gz unison-ocaml-4.03.patch New: ---- unison-2.48.4-manual.html unison-2.48.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unison.spec ++++++ --- /var/tmp/diff_new_pack.2ekCmR/_old 2017-11-23 09:43:50.605763701 +0100 +++ /var/tmp/diff_new_pack.2ekCmR/_new 2017-11-23 09:43:50.609763555 +0100 @@ -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 @@ 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 @@ replica to the other. %prep -%setup -q -%patch0 -p1 +%setup -qn src %build # This package failed when testing with -Wl,-as-needed being default. ++++++ unison-2.48.3-manual.html -> unison-2.48.4-manual.html ++++++ --- /work/SRC/openSUSE:Factory/unison/unison-2.48.3-manual.html 2015-02-23 13:19:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unison.new/unison-2.48.4-manual.html 2017-11-23 09:43:48.609836537 +0100 @@ -36,8 +36,8 @@ <BR> <div id="manualheader"><DIV CLASS="center"><FONT SIZE=7><FONT COLOR=black>Unison File Synchronizer</FONT><BR> <FONT SIZE=6><FONT COLOR=black>User Manual and Reference Guide</FONT><BR> -<FONT SIZE=5>Version 2.48.3<BR> -<FONT SIZE=4>Copyright 1998-2015, Benjamin C. Pierce +<FONT SIZE=5>Version 2.48.4<BR> +<FONT SIZE=4>Copyright 1998-2012, Benjamin C. Pierce </FONT></FONT></FONT></FONT></DIV></div><BR> <BR> <!--TOC section Contents--> @@ -105,7 +105,7 @@ <A HREF="#ssh"><FONT SIZE=4><B>Installing Ssh</B></FONT></A><BR> •<A HREF="#ssh-unix">Unix</A><BR> •<A HREF="#ssh-win">Windows</A><BR> -<A HREF="#news"><FONT SIZE=4><B>Changes in Version 2.48.3</B></FONT></A><BR> +<A HREF="#news"><FONT SIZE=4><B>Changes in Version 2.48.4</B></FONT></A><BR> </BLOCKQUOTE> @@ -387,15 +387,8 @@ <H4 CLASS="subsubsection"><A NAME="build-unix"></A>Unix</H4><!--SEC END --> -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 <TT>make UISTYLE=text</TT> to build -Unison without GUI.<BR> -<BR> -You'll need the Objective Caml compiler, -available from <A HREF="http://caml.inria.fr";><TT>http://caml.inria.fr</TT></A>. 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 <A HREF="http://caml.inria.fr";><TT>http://caml.inria.fr</TT></A>. 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 @@ not parallelizable, so don't use make flags which cause it to start processes in parallel, e.g. -j for GNU make.<BR> <BR> -Once you've got OCaml installed, grab a copy of the Unison sources, unzip -and untar them, change to the new <FONT SIZE=4><TT>unison</TT></FONT> directory, and type “<TT>make UISTYLE=text</TT>”. The result should be an executable file called -<FONT SIZE=4><TT>unison</TT></FONT>. Type <FONT SIZE=4><TT>./unison</TT></FONT> to make sure the program is -executable. You should get back a usage message.<BR> +Once you've got OCaml installed, grab a copy of the Unison sources, +unzip and untar them, change to the new <FONT SIZE=4><TT>unison</TT></FONT> directory, and +type “<TT>make UISTYLE=text</TT>”. +The result should be an executable file called <FONT SIZE=4><TT>unison</TT></FONT>. +Type <FONT SIZE=4><TT>./unison</TT></FONT> to make sure the program is executable. You +should get back a usage message.<BR> <BR> If you want to build the graphical user interface, you will need to install -some additional things: +two additional things: <UL CLASS="itemize"><LI CLASS="li-itemize"> -The Gtk2 development libraries (package <TT>libgtk2.0-dev</TT> on debian -based systems). -<LI CLASS="li-itemize">OCaml bindings for Gtk2. Install them from your software repositories -(package <TT>liblablgtk2-ocaml</TT> on debian based systems). Also available -from <A HREF="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html";><TT>http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html</TT></A>. -<LI CLASS="li-itemize">Pango, a text rendering library and a part of Gtk2. On some systems -(e.g. Ubuntu) the bindings between Pango and OCaml need to be installed -explicitly (package <TT>liblablgtk-extras-ocaml-dev</TT> on Ubuntu). -</UL> -Type <TT>make</TT> to build Unison. If Gtk2 is available on the system, Unison -with a GUI will be built automatically. <BR> -<BR> -Put the <CODE>unison</CODE> 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 <TT>make install</TT> to install Unison to <TT>$HOME/bin/unison</TT>.<BR> +The Gtk2 libraries. These areavailable from + <A HREF="http://www.gtk.org";><TT>http://www.gtk.org</TT></A> and are standard on many Unix installations. <BR> +<BR> +<LI CLASS="li-itemize">The <TT>lablgtk2</TT> OCaml library. Grab the + developers' tarball from + <BLOCKQUOTE CLASS="quote"> + <A HREF="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html";><TT>http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html</TT></A>, + </BLOCKQUOTE> + untar it, and follow the instructions to build and install it.<BR> +<BR> +(Quick start: <TT>make configure</TT>, then <TT>make</TT>, then <TT>make + opt</TT>, then <TT>su</TT> and <TT>make install</TT>.) +</UL> +Now build unison. If your search paths are set up correctly, simply typing +<TT>make</TT> +again should build a <CODE>unison</CODE> executable with a Gtk2 graphical +interface. (In previous releases of Unison, it was necessary to add <TT>UISTYLE=gtk2</TT> to the 'make' command above. This requirement has been +removed: the makefile should detect automatically when lablgtk2 is +present and set this flag automatically.) <BR> +<BR> +Put the <CODE>unison</CODE> 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.<BR> <BR> <!--TOC subsubsection Mac OS X--> @@ -2782,9 +2784,9 @@ hosts, provide your remote user name when providing the remote root (i.e., <CODE>//username@host/path...</CODE>). </OL> -<hr><!--TOC section Changes in Version 2.48.3--> +<hr><!--TOC section Changes in Version 2.48.4--> -<H2 CLASS="section"><A NAME="news"></A>Changes in Version 2.48.3</H2><!--SEC END --> +<H2 CLASS="section"><A NAME="news"></A>Changes in Version 2.48.4</H2><!--SEC END --> Changes since 2.45: <UL CLASS="itemize"><LI CLASS="li-itemize"> ++++++ unison-2.48.3.tar.gz -> unison-2.48.4.tar.gz ++++++ ++++ 3590 lines of diff (skipped)
