rpms/unison/devel unison-fix.patch,NONE,1.1 unison.spec,1.7,1.8

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/unison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15793

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/devel/unison.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unison.spec	6 Apr 2005 22:13:34 -0000	1.7
+++ unison.spec	16 May 2005 18:31:44 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           unison
 Version:        2.10.2
-Release:        3
+Release:        4
 
 Summary:        File-synchronization tool
 
@@ -9,7 +9,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
@@ -25,7 +25,7 @@
 
 %prep
 %setup -q
-#%patch -p1
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} NATIVE=true UISTYLE=gtk2
@@ -71,6 +71,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
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt