commit unison for openSUSE:Factory

2020-03-09 Thread root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2020-03-09 18:33:59

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new.26092 (New)


Package is "unison"

Mon Mar  9 18:33:59 2020 rev:39 rq:782743 version:2.51.2

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2019-11-27 
13:52:59.848387261 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new.26092/unison.changes 2020-03-09 
18:34:04.610016629 +0100
@@ -1,0 +2,9 @@
+Sat Feb 29 20:20:20 UTC 2020 - o...@aepfle.de
+
+- Update to v2.51.2, via _service file
+- add Fix-warnings-raised-by-OCaml-4.08.1.patch
+- add Compile-without-unsafe-string.patch
+- update Compatibility-with-OCaml-4.08.patch
+- update Fix-for-lablgtk-2.18.6.patch
+
+---

Old:

  unison-2.48.15.tar.xz

New:

  Compile-without-unsafe-string.patch
  Fix-warnings-raised-by-OCaml-4.08.1.patch
  unison-2.51.2.tar.xz



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.mM96Qv/_old  2020-03-09 18:34:06.482017645 +0100
+++ /var/tmp/diff_new_pack.mM96Qv/_new  2020-03-09 18:34:06.506017659 +0100
@@ -17,7 +17,7 @@
 
 
 Name:   unison
-Version:2.48.15
+Version:2.51.2
 Release:0
 %{?ocaml_preserve_bytecode}
 Summary:File synchronization tool
@@ -31,10 +31,13 @@
 Source3:%{name}.png
 Patch0: Compatibility-with-OCaml-4.08.patch
 Patch1: Fix-for-lablgtk-2.18.6.patch
+Patch2: Fix-warnings-raised-by-OCaml-4.08.1.patch
+Patch3: Compile-without-unsafe-string.patch
 BuildRequires:  gtk2-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  ocaml(ocaml_base_version) >= 4.07
 BuildRequires:  ocaml-lablgtk2-devel > 2.18.5
-BuildRequires:  ocaml-rpm-macros >= 4.03.0
+BuildRequires:  ocaml-rpm-macros >= 20200220
 BuildRequires:  update-desktop-files
 
 %description

++ Compatibility-with-OCaml-4.08.patch ++
--- /var/tmp/diff_new_pack.mM96Qv/_old  2020-03-09 18:34:06.714017772 +0100
+++ /var/tmp/diff_new_pack.mM96Qv/_new  2020-03-09 18:34:06.734017782 +0100
@@ -1,19 +1,16 @@
-From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
 From: Jaap Boender 
 Date: Thu, 21 Mar 2019 12:26:51 +
 Subject: Compatibility with OCaml 4.08
 
 ---
- files.ml | 2 +-
- recon.ml | 4 ++--
- system/system_generic.ml | 2 +-
+ src/files.ml | 2 +-
+ src/recon.ml | 4 ++--
+ src/system/system_generic.ml | 2 +-
  3 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/files.ml b/files.ml
-index ba42ad5..5babf21 100644
 --- a/files.ml
 +++ b/files.ml
-@@ -722,7 +722,7 @@ let get_files_in_directory dir =
+@@ -734,7 +734,7 @@ let get_files_in_directory dir =
with End_of_file ->
  dirh.System.closedir ()
end;
@@ -22,11 +19,9 @@
  
  let ls dir pattern =
Util.convertUnixErrorsToTransient
-diff --git a/recon.ml b/recon.ml
-index 5ed358d..0df2cfe 100644
 --- a/recon.ml
 +++ b/recon.ml
-@@ -651,8 +651,8 @@ let rec reconcile
+@@ -661,8 +661,8 @@ let rec reconcile
  
  (* Sorts the paths so that they will be displayed in order   
*)
  let sortPaths pathUpdatesList =
@@ -37,8 +32,6 @@
  pathUpdatesList
  
  let rec enterPath p1 p2 t =
-diff --git a/system/system_generic.ml b/system/system_generic.ml
-index ed8e18f..0e28a78 100755
 --- a/system/system_generic.ml
 +++ b/system/system_generic.ml
 @@ -47,7 +47,7 @@ let open_out_gen = open_out_gen

++ Compile-without-unsafe-string.patch ++
 1386 lines (skipped)

++ Fix-for-lablgtk-2.18.6.patch ++
--- /var/tmp/diff_new_pack.mM96Qv/_old  2020-03-09 18:34:06.986017919 +0100
+++ /var/tmp/diff_new_pack.mM96Qv/_new  2020-03-09 18:34:07.010017933 +0100
@@ -1,17 +1,14 @@
-From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001
 From: daviddavid 
 Date: Mon, 26 Feb 2018 13:36:36 +0100
 Subject: Fix for lablgtk >= 2.18.6
 
 ---
- uigtk2.ml | 4 ++--
+ src/uigtk2.ml | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/uigtk2.ml b/uigtk2.ml
-index 2ba6d79..04c4da4 100644
 --- a/uigtk2.ml
 +++ b/uigtk2.ml
-@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic")
+@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_s
  (* This does not work with the current version of Lablgtk, due to a bug
  let icon =
GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true

++ Fix-warnings-raised-by-OCaml-4.08.1.patch ++
From: Stephane Glondu 
Date: Mon, 10 Feb 2020 13:10:23 +0100
Subject: Fix warnings raised by OCaml 4.08.1

---
 src/bytearray.ml |  4 ++--
 src/case.ml

commit unison for openSUSE:Factory

2019-11-27 Thread root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2019-11-27 13:52:50

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new.26869 (New)


Package is "unison"

Wed Nov 27 13:52:50 2019 rev:38 rq:748254 version:2.48.15

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2019-11-03 
12:19:06.697132519 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new.26869/unison.changes 2019-11-27 
13:52:59.848387261 +0100
@@ -1,0 +2,8 @@
+Wed Nov 13 12:34:56 UTC 2019 - o...@aepfle.de
+
+- Update to v2.48v4, via _service file
+- Add Compatibility-with-OCaml-4.08.patch
+- Add Fix-for-lablgtk-2.18.6.patch
+- Require lablgtk2 > 2.18.5
+
+---

Old:

  unison-2.48.4.tar.gz

New:

  Compatibility-with-OCaml-4.08.patch
  Fix-for-lablgtk-2.18.6.patch
  _service
  unison-2.48.15.tar.xz



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.Dx2Je4/_old  2019-11-27 13:53:00.392386809 +0100
+++ /var/tmp/diff_new_pack.Dx2Je4/_new  2019-11-27 13:53:00.396386806 +0100
@@ -12,28 +12,30 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:   unison
-Version:2.48.4
+Version:2.48.15
 Release:0
 %{?ocaml_preserve_bytecode}
 Summary:File synchronization tool
 License:GPL-3.0+
 Group:  Productivity/Networking/Other
-Url:http://www.cis.upenn.edu/~bcpierce/unison
-Source0:
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}.tar.gz
-Source1:
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html
+Url:https://github.com/bcpierce00/unison
+Source0:%{name}-%{version}.tar.xz
+#https://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html
+Source1:unison-2.48.4-manual.html
 Source2:%{name}.desktop
 Source3:%{name}.png
+Patch0: Compatibility-with-OCaml-4.08.patch
+Patch1: Fix-for-lablgtk-2.18.6.patch
 BuildRequires:  gtk2-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  ocaml-lablgtk2-devel < 2.18.8
+BuildRequires:  ocaml-lablgtk2-devel > 2.18.5
 BuildRequires:  ocaml-rpm-macros >= 4.03.0
 BuildRequires:  update-desktop-files
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 Unison is a file synchronization tool for Unix and Windows. It allows
@@ -43,7 +45,7 @@
 replica to the other.
 
 %prep
-%setup -qn src
+%autosetup -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
@@ -66,7 +68,6 @@
 %suse_update_desktop_file -i %name Utility SyncUtility
 
 %files
-%defattr(-,root,root)
 %doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt unison-manual.html
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/unison.png

++ Compatibility-with-OCaml-4.08.patch ++
>From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
From: Jaap Boender 
Date: Thu, 21 Mar 2019 12:26:51 +
Subject: Compatibility with OCaml 4.08

---
 files.ml | 2 +-
 recon.ml | 4 ++--
 system/system_generic.ml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files.ml b/files.ml
index ba42ad5..5babf21 100644
--- a/files.ml
+++ b/files.ml
@@ -722,7 +722,7 @@ let get_files_in_directory dir =
   with End_of_file ->
 dirh.System.closedir ()
   end;
-  Sort.list (<) !files
+  List.sort String.compare !files
 
 let ls dir pattern =
   Util.convertUnixErrorsToTransient
diff --git a/recon.ml b/recon.ml
index 5ed358d..0df2cfe 100644
--- a/recon.ml
+++ b/recon.ml
@@ -651,8 +651,8 @@ let rec reconcile
 
 (* Sorts the paths so that they will be displayed in order   *)
 let sortPaths pathUpdatesList =
-  Sort.list
-(fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+  List.sort
+Path.compare
 pathUpdatesList
 
 let rec enterPath p1 p2 t =
diff --git a/system/system_generic.ml b/system/system_generic.ml
index ed8e18f..0e28a78 100755
--- a/system/system_generic.ml
+++ b/system/system_generic.ml
@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
 let chmod = Unix.chmod
 let chown = Unix.chown
 let utimes = Unix.utimes
-let link = Unix.link
+let link s d = Unix.link s d
 let openfile = Unix.openfile
 let opendir f =
   let h = Unix.opendir f in
++ Fix-for-lablgtk-2.18.6.patch ++
>From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001
From:

commit unison for openSUSE:Factory

2019-11-03 Thread root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2019-11-03 12:19:05

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new.2990 (New)


Package is "unison"

Sun Nov  3 12:19:05 2019 rev:37 rq:744822 version:2.48.4

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2017-11-23 
09:43:49.073819605 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new.2990/unison.changes  2019-11-03 
12:19:06.697132519 +0100
@@ -1,0 +2,5 @@
+Fri Nov  1 11:21:31 UTC 2019 - o...@aepfle.de
+
+- Require lablgtk2 < 2.18.8
+
+---



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.unW7RW/_old  2019-11-03 12:19:07.265133219 +0100
+++ /var/tmp/diff_new_pack.unW7RW/_new  2019-11-03 12:19:07.269133224 +0100
@@ -30,7 +30,7 @@
 Source3:%{name}.png
 BuildRequires:  gtk2-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  ocaml-lablgtk2-devel
+BuildRequires:  ocaml-lablgtk2-devel < 2.18.8
 BuildRequires:  ocaml-rpm-macros >= 4.03.0
 BuildRequires:  update-desktop-files
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build

commit unison for openSUSE:Factory

2017-11-23 Thread root 
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.changes2017-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 - ok...@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
+
+---

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.0 +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 @@
 
 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 @@
 Installing Ssh
 Unix
 Windows
-Changes in Version 2.48.3
+Changes in Version 2.48.4
 
  
  
@@ -387,15 +387,8 @@
 
 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;>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;>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 @@
 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:
 
-The Gtk2 development libraries (package libgtk2.0-dev on debian
-based systems).
-OCaml bindings for Gtk2. Install them from your 
software repositories
-(package

commit unison for openSUSE:Factory

2017-10-11 Thread root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2017-10-11 23:03:05

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new (New)


Package is "unison"

Wed Oct 11 23:03:05 2017 rev:35 rq:533174 version:2.48.3

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2016-07-20 
09:17:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes   2017-10-11 
23:03:12.524025030 +0200
@@ -1,0 +2,5 @@
+Mon Jul 17 12:48:58 UTC 2017 - o...@aepfle.de
+
+- Wrap specfile conditionals to fix quilt setup
+
+---



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.lo9ZYn/_old  2017-10-11 23:03:13.651975611 +0200
+++ /var/tmp/diff_new_pack.lo9ZYn/_new  2017-10-11 23:03:13.655975436 +0200
@@ -19,7 +19,7 @@
 Name:   unison
 Version:2.48.3
 Release:0
-%{ocaml_preserve_bytecode}
+%{?ocaml_preserve_bytecode}
 Summary:File synchronization tool
 License:GPL-3.0+
 Group:  Productivity/Networking/Other
@@ -51,7 +51,7 @@
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and 
the line below.
 export SUSE_ASNEEDED=0
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 NATIVE=true
 %else
 NATIVE=false

commit unison for openSUSE:Factory

2016-07-20 Thread h_root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2016-07-20 09:17:29

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new (New)


Package is "unison"

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2015-10-20 
00:06:21.0 +0200
+++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes   2016-07-20 
09:17:31.0 +0200
@@ -1,0 +2,6 @@
+Mon May 23 09:52:29 UTC 2016 - o...@aepfle.de
+
+- Require ocaml >= 4.0.3 due to its API change in Unix.symlink
+  unison-ocaml-4.03.patch
+
+---

New:

  unison-ocaml-4.03.patch



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.juaknc/_old  2016-07-20 09:17:32.0 +0200
+++ /var/tmp/diff_new_pack.juaknc/_new  2016-07-20 09:17:32.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package unison
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -16,17 +16,10 @@
 #
 
 
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if !%opt
-# get rid of /usr/lib/rpm/find-debuginfo.sh
-# strip kills the bytecode part of ELF binaries
-# see also NO_BRP_STRIP_DEBUG in install section
-%undefine _build_create_debug
-%endif
-
 Name:   unison
 Version:2.48.3
 Release:0
+%{ocaml_preserve_bytecode}
 Summary:File synchronization tool
 License:GPL-3.0+
 Group:  Productivity/Networking/Other
@@ -35,9 +28,11 @@
 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
+BuildRequires:  ocaml-rpm-macros >= 4.03.0
 BuildRequires:  update-desktop-files
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -50,12 +45,13 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and 
the line below.
 export SUSE_ASNEEDED=0
-%if %opt
+%if %{ocaml_native_compiler}
 NATIVE=true
 %else
 NATIVE=false
@@ -63,11 +59,6 @@
 make UISTYLE=gtk2 NATIVE=$NATIVE THREADS=true
 
 %install
-%if !%opt
-# get rid of /usr/lib/rpm/brp-strip-debug 
-# strip kills the bytecode part of ELF binaries
-export NO_BRP_STRIP_DEBUG=true
-%endif
 install -m 755 -d %{buildroot}/%{_bindir}
 install -m 755 %{name} %{buildroot}%{_bindir}
 install -m 755 %{name}-fsmonitor %{buildroot}%{_bindir}

++ unison-ocaml-4.03.patch ++
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

commit unison for openSUSE:Factory

2015-10-19 Thread h_root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2015-10-19 22:52:31

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new (New)


Package is "unison"

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2015-02-23 
13:19:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes   2015-10-20 
00:06:21.0 +0200
@@ -1,0 +2,10 @@
+Sat Oct 10 09:40:28 UTC 2015 - o...@aepfle.de
+
+- Replace BuildRequires lablgtk2-devel with ocaml-lablgtk2-devel
+
+---
+Fri Oct  9 18:44:33 UTC 2015 - tilman.vo...@web.de
+
+- include unison-fsmonitor binary in package
+
+---



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.Xitjqj/_old  2015-10-20 00:06:21.0 +0200
+++ /var/tmp/diff_new_pack.Xitjqj/_new  2015-10-20 00:06:21.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package unison
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -36,8 +36,8 @@
 Source2:%{name}.desktop
 Source3:%{name}.png
 BuildRequires:  gtk2-devel
-BuildRequires:  lablgtk2-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  ocaml-lablgtk2-devel
 BuildRequires:  update-desktop-files
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -69,7 +69,8 @@
 export NO_BRP_STRIP_DEBUG=true
 %endif
 install -m 755 -d %{buildroot}/%{_bindir}
-install -m 755 %name %{buildroot}%{_bindir}
+install -m 755 %{name} %{buildroot}%{_bindir}
+install -m 755 %{name}-fsmonitor %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}/%{_prefix}/share/pixmaps
 install -m 644 %{SOURCE3} %{buildroot}/%{_prefix}/share/pixmaps
 install -m 644 %{SOURCE1} unison-manual.html
@@ -81,5 +82,6 @@
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/unison.png
 %{_bindir}/%{name}
+%{_bindir}/%{name}-fsmonitor
 
 %changelog

commit unison for openSUSE:Factory

2015-02-23 Thread h_root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2015-02-23 13:19:26

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new (New)


Package is unison

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2013-03-08 
09:55:10.0 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes   2015-02-23 
13:19:28.0 +0100
@@ -1,0 +2,13 @@
+Sat Feb 21 22:04:36 CET 2015 - oli...@getspam.de
+
+- Update to 2.48.3:
+  * Uprintf module replaced with functionality from the standard
+library (doesn't work with ocaml4.02, caused crash)
+  * many file system monitoring improvements
+  * some minor changes (maxsizethreshold option and a 
+copyonconflict preference added)
+  
+- removed build-fix-EG11.1.patch: was only applied for os 11.1
+  which is not supported anymore
+
+---

Old:

  build-fix-EG11.1.patch
  unison-2.40.102-manual.html
  unison-2.40.102.tar.gz

New:

  unison-2.48.3-manual.html
  unison-2.48.3.tar.gz



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.t2BGHb/_old  2015-02-23 13:19:29.0 +0100
+++ /var/tmp/diff_new_pack.t2BGHb/_new  2015-02-23 13:19:29.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package unison
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %endif
 
 Name:   unison
-Version:2.40.102
+Version:2.48.3
 Release:0
 Summary:File synchronization tool
 License:GPL-3.0+
@@ -35,7 +35,6 @@
 Source1:
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-%{version}-manual.html
 Source2:%{name}.desktop
 Source3:%{name}.png
-Patch0: build-fix-EG11.1.patch
 BuildRequires:  gtk2-devel
 BuildRequires:  lablgtk2-devel
 BuildRequires:  ncurses-devel
@@ -51,9 +50,6 @@
 
 %prep
 %setup -q
-%if 0%{?suse_version} == 01110
-%patch -p1
-%endif
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.

++ unison-2.40.102-manual.html - unison-2.48.3-manual.html ++
--- /work/SRC/openSUSE:Factory/unison/unison-2.40.102-manual.html   
2013-01-14 12:04:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new/unison-2.48.3-manual.html
2015-02-23 13:19:28.0 +0100
@@ -36,8 +36,8 @@
 BR
 div id=manualheaderDIV CLASS=centerFONT SIZE=7FONT 
COLOR=blackUnison File Synchronizer/FONTBR
 FONT SIZE=6FONT COLOR=blackUser Manual and Reference Guide/FONTBR
-FONT SIZE=5Version 2.40.65BR
-FONT SIZE=4Copyright 1998-2009, Benjamin C. Pierce
+FONT SIZE=5Version 2.48.3BR
+FONT SIZE=4Copyright 1998-2015, Benjamin C. Pierce
  /FONT/FONT/FONT/FONT/DIV/divBR
 BR
 !--TOC section Contents--
@@ -105,7 +105,7 @@
 A HREF=#sshFONT SIZE=4BInstalling Ssh/B/FONT/ABR
 nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;#8226;A 
HREF=#ssh-unixUnix/ABR
 nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;#8226;A 
HREF=#ssh-winWindows/ABR
-A HREF=#newsFONT SIZE=4BChanges in Version 2.40.65/B/FONT/ABR
+A HREF=#newsFONT SIZE=4BChanges in Version 2.48.3/B/FONT/ABR
 
  /BLOCKQUOTE
  
@@ -387,8 +387,15 @@
 
 H4 CLASS=subsubsectionA NAME=build-unix/AUnix/H4!--SEC END --
 
-You'll need the Objective Caml compiler (version 3.11.2 or later), which is
-available from A 
HREF=http://caml.inria.fr;TThttp://caml.inria.fr/TT/A. Building and 
installing OCaml
+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 TTmake 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;TThttp://caml.inria.fr/TT/A. OCaml is 
available from most
+package managers 
+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
@@ -403,39 +410,30 @@
 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=4TTunison/TT/FONT 
directory, and
-type #8220;TTmake UISTYLE=text/TT.#8221;
-The result should be an

commit unison for openSUSE:Factory

2013-03-08 Thread h_root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2013-03-08 09:55:08

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new (New)


Package is unison, Maintainer is orpha...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2013-01-14 
12:04:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes   2013-03-08 
09:55:10.0 +0100
@@ -1,0 +2,6 @@
+Wed Jan 16 16:40:46 CET 2013 - oher...@suse.de
+
+- disable strip and /usr/lib/rpm/find-debuginfo.sh for non-opt builds
+  it destroys bytecode binaries
+
+---



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.BLFXNW/_old  2013-03-08 09:55:11.0 +0100
+++ /var/tmp/diff_new_pack.BLFXNW/_new  2013-03-08 09:55:11.0 +0100
@@ -16,6 +16,14 @@
 #
 
 
+%define opt %(test -x %{_bindir}/ocamlopt  echo 1 || echo 0)
+%if !%opt
+# get rid of /usr/lib/rpm/find-debuginfo.sh
+# strip kills the bytecode part of ELF binaries
+# see also NO_BRP_STRIP_DEBUG in install section
+%undefine _build_create_debug
+%endif
+
 Name:   unison
 Version:2.40.102
 Release:0
@@ -51,23 +59,25 @@
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and 
the line below.
 export SUSE_ASNEEDED=0
-%ifarch s390 s390x
-make UISTYLE=gtk2 NATIVE=false THREADS=false
+%if %opt
+NATIVE=true
 %else
-make UISTYLE=gtk2 NATIVE=true THREADS=true
+NATIVE=false
 %endif
+make UISTYLE=gtk2 NATIVE=$NATIVE THREADS=true
 
 %install
+%if !%opt
+# get rid of /usr/lib/rpm/brp-strip-debug 
+# strip kills the bytecode part of ELF binaries
+export NO_BRP_STRIP_DEBUG=true
+%endif
 install -m 755 -d %{buildroot}/%{_bindir}
 install -m 755 %name %{buildroot}%{_bindir}
 install -m 755 -d %{buildroot}/%{_prefix}/share/pixmaps
 install -m 644 %{SOURCE3} %{buildroot}/%{_prefix}/share/pixmaps
 install -m 644 %{SOURCE1} unison-manual.html
 %suse_update_desktop_file -i %name Utility SyncUtility
-%ifarch s390 s390x
-# do not strip non-optimized builds
-export NO_BRP_STRIP_DEBUG=true
-%endif
 
 %files
 %defattr(-,root,root)


-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit unison for openSUSE:Factory

2013-01-14 Thread h_root 
Hello community,

here is the log from the commit of package unison for openSUSE:Factory checked 
in at 2013-01-14 12:04:00

Comparing /work/SRC/openSUSE:Factory/unison (Old)
 and  /work/SRC/openSUSE:Factory/.unison.new (New)


Package is unison, Maintainer is orpha...@suse.de

Changes:

--- /work/SRC/openSUSE:Factory/unison/unison.changes2012-02-16 
15:02:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.unison.new/unison.changes   2013-01-14 
12:04:04.0 +0100
@@ -1,0 +2,7 @@
+Mon Jan 14 08:05:03 UTC 2013 - sasc...@suse.de
+
+- Update to version 2.40.102:
+  + Upstream provides no changelog
+- Uppercase name and a comment in unison.desktop
+
+---

Old:

  unison-2.40.63-manual.html
  unison-2.40.63.tar.gz

New:

  unison-2.40.102-manual.html
  unison-2.40.102.tar.gz



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.IMLRya/_old  2013-01-14 12:04:05.0 +0100
+++ /var/tmp/diff_new_pack.IMLRya/_new  2013-01-14 12:04:05.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package unison
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,9 +17,9 @@
 
 
 Name:   unison
-Version:2.40.63
+Version:2.40.102
 Release:0
-Summary:A file synchronization tool
+Summary:File synchronization tool
 License:GPL-3.0+
 Group:  Productivity/Networking/Other
 Url:http://www.cis.upenn.edu/~bcpierce/unison
@@ -28,15 +28,11 @@
 Source2:%{name}.desktop
 Source3:%{name}.png
 Patch0: build-fix-EG11.1.patch
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gtk2-devel
+BuildRequires:  lablgtk2-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  update-desktop-files
-%if 0%{?suse_version}  1020
-BuildRequires:  lablgtk2-devel
-%else
-BuildRequires:  lablgtk2
-%endif
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 Unison is a file synchronization tool for Unix and Windows. It allows
@@ -73,12 +69,9 @@
 export NO_BRP_STRIP_DEBUG=true
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
-%doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt TODO.txt 
unison-manual.html
+%doc BUGS.txt CONTRIB COPYING NEWS README ROADMAP.txt unison-manual.html
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/unison.png
 %{_bindir}/%{name}

++ unison-2.40.63-manual.html - unison-2.40.102-manual.html ++
--- /work/SRC/openSUSE:Factory/unison/unison-2.40.63-manual.html
2011-09-23 12:49:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.unison.new/unison-2.40.102-manual.html  
2013-01-14 12:04:04.0 +0100
@@ -36,7 +36,7 @@
 BR
 div id=manualheaderDIV CLASS=centerFONT SIZE=7FONT 
COLOR=blackUnison File Synchronizer/FONTBR
 FONT SIZE=6FONT COLOR=blackUser Manual and Reference Guide/FONTBR
-FONT SIZE=5Version 2.40.61BR
+FONT SIZE=5Version 2.40.65BR
 FONT SIZE=4Copyright 1998-2009, Benjamin C. Pierce
  /FONT/FONT/FONT/FONT/DIV/divBR
 BR
@@ -105,7 +105,7 @@
 A HREF=#sshFONT SIZE=4BInstalling Ssh/B/FONT/ABR
 nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;#8226;A 
HREF=#ssh-unixUnix/ABR
 nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;nbsp;#8226;A 
HREF=#ssh-winWindows/ABR
-A HREF=#newsFONT SIZE=4BChanges in Version 2.40.61/B/FONT/ABR
+A HREF=#newsFONT SIZE=4BChanges in Version 2.40.65/B/FONT/ABR
 
  /BLOCKQUOTE
  
@@ -399,7 +399,9 @@
 BR
 You'll also need the GNU TTmake/TT utility, standard on many Unix
 systems. (Type FONT SIZE=4TTmake ndash;version/TT/FONT to check that 
you've got the
-GNU version.)BR
+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.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=4TTunison/TT/FONT 
directory, and
@@ -703,9 +705,7 @@
 
 The standard remote shell facility on Unix systems is CODEssh/CODE, which 
provides the
 same functionality as the older CODErsh/CODE but much better security. Ssh 
is available from
-A 
HREF=ftp://ftp.cs.hut.fi/pub/ssh/;TTftp://ftp.cs.hut.fi/pub/ssh//TT/A; 
up-to-date binaries for some
-architectures can also be found at
-A 
HREF=ftp://ftp.faqs.org/ssh/contrib;TTftp://ftp.faqs.org/ssh/contrib/TT/A.
 See sectionnbsp;A HREF=#ssh-winA.2/A
+A HREF=http://www.openssh.org;TThttp://www.openssh.org/TT/A. See 
sectionnbsp;A HREF=#ssh-winA.2/A
 for

commit unison for openSUSE:Factory

2011-05-18 Thread h_root 

Hello community,

here is the log from the commit of package unison for openSUSE:Factory
checked in at Wed May 18 14:49:59 CEST 2011.




--- unison/unison.changes   2011-03-31 15:20:54.0 +0200
+++ /mounts/work_src_done/STABLE/unison/unison.changes  2011-04-29 
13:05:46.0 +0200
@@ -1,0 +2,8 @@
+Fri Apr 29 09:13:36 UTC 2011 - mh...@novell.com
+
+- Update to 2.40.63:
+  * Include makefile patch
+  * Make unison compile with ocaml 3.12
+  * Fix incompatibility with OpenSSH 5.6
+
+---

calling whatdependson for head-i586


Old:

  fix_makefile.patch
  unison-2.40.61-manual.html
  unison-2.40.61.tar.gz

New:

  unison-2.40.63-manual.html
  unison-2.40.63.tar.gz



Other differences:
--
++ unison.spec ++
--- /var/tmp/diff_new_pack.s3pesw/_old  2011-05-18 14:49:15.0 +0200
+++ /var/tmp/diff_new_pack.s3pesw/_new  2011-05-18 14:49:15.0 +0200
@@ -18,7 +18,7 @@
 
 
 Name:   unison
-Version:2.40.61
+Version:2.40.63
 Release:1
 Summary:A file synchronization tool
 Group:  Productivity/Networking/Other
@@ -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: fix_makefile.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gtk2-devel ncurses-devel update-desktop-files
 %if 0%{?suse_version}  1020
@@ -47,7 +46,6 @@
 
 %prep
 %setup -q
-%patch0 -p 1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.

++ unison-2.40.61-manual.html - unison-2.40.63-manual.html ++

++ unison-2.40.61.tar.gz - unison-2.40.63.tar.gz ++
 6131 lines of diff (skipped)







Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org