[unison240] New upstream version 2.40.128 (RHBZ#1178444).
Richard W.M. Jones
rjones at fedoraproject.org
Mon Jan 19 08:31:52 UTC 2015
commit 0d85a177d98f7555437331b3bcba7824b94526ab
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Jan 19 08:27:58 2015 +0000
New upstream version 2.40.128 (RHBZ#1178444).
- Remove missing documentation patch, now included upstream.
.gitignore | 1 +
sources | 2 +-
....102-manual.html => unison-2.40.128-manual.html | 10 +-
unison240-missing-documentation.patch | 4474 --------------------
unison240.spec | 13 +-
5 files changed, 13 insertions(+), 4487 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c68ae51..c00126e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/unison-2.40.63.tar.gz
/unison-2.40.102.tar.gz
+/unison-2.40.128.tar.gz
diff --git a/sources b/sources
index 54b0fc2..701ee04 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42caf869f40440ed0e75eef07a605b2e unison-2.40.102.tar.gz
+aa4d9d425b2ee2f9676ac5331a154bac unison-2.40.128.tar.gz
diff --git a/unison-2.40.102-manual.html b/unison-2.40.128-manual.html
similarity index 99%
rename from unison-2.40.102-manual.html
rename to unison-2.40.128-manual.html
index e05906b..361f4aa 100644
--- a/unison-2.40.102-manual.html
+++ b/unison-2.40.128-manual.html
@@ -36,7 +36,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
<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.40.65<BR>
+<FONT SIZE=5>Version 2.40.128<BR>
<FONT SIZE=4>Copyright 1998-2009, Benjamin C. Pierce
</FONT></FONT></FONT></FONT></DIV></div><BR>
<BR>
@@ -105,7 +105,7 @@ BLOCKQUOTE{margin-left:4ex;margin-right:4ex;text-align:left;}
<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.40.65</B></FONT></A><BR>
+<A HREF="#news"><FONT SIZE=4><B>Changes in Version 2.40.128</B></FONT></A><BR>
</BLOCKQUOTE>
@@ -1694,7 +1694,7 @@ Including the preference <TT>nocreationpartial = <I>PATHSPEC</I></TT><TT> ->
<DT CLASS="dt-description"><B>nodeletion <TT>xxx</TT></B><DD CLASS="dd-description">
Including the preference <TT>-nodeletion <I>root</I></TT> prevents Unison from performing any file deletion on root <TT><I>root</I></TT>.<BR>
<BR>
-This preference can be included twice, once for each root, if you want to prevent any creation.<BR>
+This preference can be included twice, once for each root, if you want to prevent any deletion.<BR>
<BR>
<DT CLASS="dt-description"><B>nodeletionpartial <TT>xxx</TT></B><DD CLASS="dd-description">
Including the preference <TT>nodeletionpartial = <I>PATHSPEC</I></TT><TT> -> <I>root</I></TT> prevents Unison from performing any file deletion in <TT><I>PATHSPEC</I></TT> on root <TT><I>root</I></TT> (see the <A HREF="#pathspec">Path Specification</A> section for more information). It is recommended to use <TT>BelowPath</TT> patterns when selecting a directory and all its contents.<BR>
@@ -2753,9 +2753,9 @@ you have trouble, you might try other ones instead:
hosts, provide your remote user name when providing the remote root
(i.e., <CODE>//username at host/path...</CODE>).
</OL>
-<hr><!--TOC section Changes in Version 2.40.65-->
+<hr><!--TOC section Changes in Version 2.40.128-->
-<H2 CLASS="section"><A NAME="news"></A>Changes in Version 2.40.65</H2><!--SEC END -->
+<H2 CLASS="section"><A NAME="news"></A>Changes in Version 2.40.128</H2><!--SEC END -->
Changes since 2.40.1:
<UL CLASS="itemize"><LI CLASS="li-itemize">
diff --git a/unison240.spec b/unison240.spec
index 16f48e5..a61d6cb 100644
--- a/unison240.spec
+++ b/unison240.spec
@@ -2,7 +2,7 @@
# These is the exact upstream version we are packaging
%define ver_maj 2
%define ver_min 40
-%define ver_patch 102
+%define ver_patch 128
# All Unison versions sharing ver_compat are compatible
# Examples are 2.13.15 and 2.13.16 -> ver_compat == 2.13
@@ -24,7 +24,7 @@
Name: unison%{ver_compat_name}
Version: %{ver_compat}%{ver_noncompat}
-Release: 8%{?dist}
+Release: 1%{?dist}
Summary: Multi-master File synchronization tool
@@ -35,9 +35,6 @@ Source0: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{
Source1: unison.png
Source2: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/unison-%{ver_compat}%{ver_noncompat}/unison-%{ver_compat}%{ver_noncompat}-manual.html
-#Add documentation, already fixed in trunk (upstream)
-Patch1: %{name}-missing-documentation.patch
-
# can't make this noarch (rpmbuild fails about unpackaged debug files)
# BuildArch: noarch
ExcludeArch: sparc64 s390 s390x
@@ -99,8 +96,6 @@ This package provides the textual version of unison without graphical interface.
%prep
%setup -q -n unison-%{version}
-%patch1 -p1 -b .documentation
-
cat > %{name}.desktop <<EOF
[Desktop Entry]
Type=Application
@@ -198,6 +193,10 @@ fi
%changelog
+* Mon Jan 19 2015 Richard W.M. Jones <rjones at redhat.com> - 2.40.128-1
+- New upstream version 2.40.128 (RHBZ#1178444).
+- Remove missing documentation patch, now included upstream.
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.40.102-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list