diff --git a/unison-2.40.63-manual.html b/unison-2.40.102-manual.html similarity index 99% rename from unison-2.40.63-manual.html rename to unison-2.40.102-manual.html index 04ea2e5..9ebfda8 100644 --- a/unison-2.40.63-manual.html +++ b/unison-2.40.102-manual.html @@ -36,7 +36,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
Unison File Synchronizer
User Manual and Reference Guide
-Version 2.40.61
+Version 2.40.65
Copyright 1998-2009, 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.40.61
+Changes in Version 2.40.65
@@ -399,7 +399,9 @@ then su to root and do make install.)

You'll also need the GNU make utility, standard on many Unix systems. (Type make –version to check that you've got the -GNU version.)
+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 @@ -703,9 +705,7 @@ the Socket Method section, as appropriate.
The standard remote shell facility on Unix systems is ssh, which provides the same functionality as the older rsh but much better security. Ssh is available from -ftp://ftp.cs.hut.fi/pub/ssh/; up-to-date binaries for some -architectures can also be found at -ftp://ftp.faqs.org/ssh/contrib. See section A.2 +http://www.openssh.org. See section A.2 for installation instructions for the Windows version.

Running @@ -2144,7 +2144,7 @@ the command. state” of the replicas. (These three options are provided for later compatibility with the Harmony data synchronizer.) -To accomodate the wide variety of programs that users might want to use for +To accommodate the wide variety of programs that users might want to use for merging, Unison checks for several possible situations when the merge program exits:
@@ -4594,7 +4594,7 @@ patterns has changed. Instead of putting a line of the form ignore = <regexp> in your profile (.unison/default.prf), you should put: 
-                 ignore = Regexp <regexp>
+                 ignore = Regex <regexp>
Moreover, two other styles of pattern are also recognized: 
                  ignore = Name <name>
diff --git a/unison-2.40.102.tar.gz b/unison-2.40.102.tar.gz
new file mode 100644
index 0000000..d463252
--- /dev/null
+++ b/unison-2.40.102.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854
+size 2694761
diff --git a/unison-2.40.63.tar.gz b/unison-2.40.63.tar.gz
deleted file mode 100644
index 7c63064..0000000
--- a/unison-2.40.63.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e6e00643a7e3908ce3604bb5031e4c6d4c6af5c421a79d08a8b7759de12cd9d
-size 2601791
diff --git a/unison.changes b/unison.changes
index e676ff6..28141f7 100644
--- a/unison.changes
+++ b/unison.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 14 08:05:03 UTC 2013 - saschpe@suse.de
+
+- Update to version 2.40.102:
+  + Upstream provides no changelog
+- Uppercase name and a comment in unison.desktop
+
 -------------------------------------------------------------------
 Mon Feb 13 10:57:21 UTC 2012 - coolo@suse.com
 
diff --git a/unison.desktop b/unison.desktop
index 11e81d2..ea74b17 100644
--- a/unison.desktop
+++ b/unison.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Type=Application
 Exec=unison
-Name=unison
+Name=Unison
+Comment=File synchronization tool
 Icon=unison
diff --git a/unison.spec b/unison.spec
index 1d147d4..8ee9b5f 100644
--- a/unison.spec
+++ b/unison.spec
@@ -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 @@ Source1:        http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stab
 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 @@ install -m 644 %{SOURCE1} unison-manual.html
 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}