rpms/unison/FC-3 unison-fix.patch,NONE,1.1 unison.spec,1.5,1.6

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/unison/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15762

Modified Files:
	unison.spec 
Added Files:
	unison-fix.patch 
Log Message:
patch: http://groups.yahoo.com/group/unison-users/message/3200

unison-fix.patch:

--- NEW FILE unison-fix.patch ---
--- unison-2.10.2/transport.ml.fix	2005-05-16 20:23:51.000000000 +0200
+++ unison-2.10.2/transport.ml	2005-05-16 20:24:37.000000000 +0200
@@ -15,7 +15,8 @@
   match uiFrom, uiTo with
     _, Updates (File (props, ContentsUpdated (_, _, ress)), _) ->
       (Props.length props, Osx.ressLength ress)
-  | Updates (File _, Previous (_, props, _, ress)), NoUpdates ->
+  | Updates (_, Previous (`FILE, props, _, ress)),
+    (NoUpdates | Updates (File (_, ContentsSame), _)) ->
       (Props.length props, Osx.ressLength ress)
   | _ ->
       assert false


Index: unison.spec
===================================================================
RCS file: /cvs/extras/rpms/unison/FC-3/unison.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- unison.spec	7 Mar 2005 21:09:02 -0000	1.5
+++ unison.spec	16 May 2005 18:31:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           unison
 Version:        2.10.2
-Release:        2
+Release:        4
 Summary:        File-synchronization tool
 
 Group:          Applications/File
@@ -8,7 +8,7 @@
 URL:            http://www.cis.upenn.edu/~bcpierce/unison
 Source:         http://www.cis.upenn.edu/~bcpierce/unison/download/beta-test/unison-2.10.2/unison-2.10.2.tar.gz
 Source1:        unison.png
-#Patch:          unison-uigtk.patch
+Patch0:		unison-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ocaml >= 3.08, lablgtk >= 2.4.0, tetex-latex
 BuildRequires:  desktop-file-utils
@@ -24,7 +24,7 @@
 
 %prep
 %setup -q
-#%patch -p1
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2
@@ -70,6 +70,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Mon May 16 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.10.2-4
+- Patch: http://groups.yahoo.com/group/unison-users/message/3200
+
 * Thu Feb 24 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.10.2-2
 - BR gtk2-devel
 - Added NEWS and README docs