diff --git a/.gitignore b/.gitignore
index b8598c7..c68ae51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/unison-2.40.63.tar.gz
+/unison-2.40.102.tar.gz
diff --git a/sources b/sources
index e6ae003..54b0fc2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3281207850cf6f0a17fe73f371893bd3 unison-2.40.63.tar.gz
+42caf869f40440ed0e75eef07a605b2e unison-2.40.102.tar.gz
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 0ec37b0..e05906b 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;}
@@ -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/unison240.spec b/unison240.spec
index fcae85b..1e0e6be 100644
--- a/unison240.spec
+++ b/unison240.spec
@@ -6,7 +6,7 @@
# These is the exact upstream version we are packaging
%define ver_maj 2
%define ver_min 40
-%define ver_patch 63
+%define ver_patch 102
# All Unison versions sharing ver_compat are compatible
# Examples are 2.13.15 and 2.13.16 -> ver_compat == 2.13
@@ -28,7 +28,7 @@
Name: unison%{ver_compat_name}
Version: %{ver_compat}%{ver_noncompat}
-Release: 7%{?dist}
+Release: 1%{?dist}
Summary: Multi-master File synchronization tool
@@ -90,6 +90,9 @@ StartupNotify=true
Categories=Utility;
EOF
+#additional documentation
+cp -a %{SOURCE2} unison-manual.html
+
%build
make NATIVE=true UISTYLE=gtk2 THREADS=true
@@ -97,12 +100,9 @@ make NATIVE=true UISTYLE=gtk2 THREADS=true
%install
mkdir -p %{buildroot}%{_bindir}
-cp -p unison %{buildroot}%{_bindir}/unison-%{ver_compat}
+cp -a unison %{buildroot}%{_bindir}/unison-%{ver_compat}
mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp -p %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
-
-#additional documentation
-cp -p %{SOURCE2} unison-manual.html
+cp -a %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
%{name}.desktop
@@ -132,6 +132,10 @@ exit 0
%changelog
+* Thu Nov 15 2012 Gregor Tätzner - 2.40.102-1
+- 2.40.102
+- fixes incompatibility between unison ocaml3 and ocaml4 builds
+
* Sun Jul 22 2012 Fedora Release Engineering - 2.40.63-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild