packages: dropbox/dropbox.spec - conflict with dropbox which would be unabl...

[glen]

Author: glen                         Date: Tue Jul 13 11:08:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflict with dropbox which would be unable to find our daemon

---- Files affected:
packages/dropbox:
   dropbox.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/dropbox/dropbox.spec
diff -u packages/dropbox/dropbox.spec:1.2 packages/dropbox/dropbox.spec:1.3
--- packages/dropbox/dropbox.spec:1.2	Thu Jul  8 17:41:53 2010
+++ packages/dropbox/dropbox.spec	Tue Jul 13 13:08:00 2010
@@ -6,7 +6,7 @@
 Summary:	Sync and backup files between computers
 Name:		dropbox
 Version:	0.7.110
-Release:	0.9
+Release:	0.10
 License:	Proprietary
 Group:		Daemons
 URL:		http://www.dropbox.com/
@@ -19,6 +19,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.566
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.15.1
+Conflicts:	nautilus-dropbox < 0.6.3-2
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -109,6 +110,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/07/13 11:08:00  glen
+- conflict with dropbox which would be unable to find our daemon
+
 Revision 1.2  2010/07/08 15:41:53  glen
 - more exec bits to python libs, rm unwanted test files
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dropbox/dropbox.spec?r1=1.2&r2=1.3&f=u