packages: chromium-browser-bin/chromium-browser-bin.spec - Binary packages ...

[caleb]

Author: caleb                        Date: Fri Jun 25 13:47:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Binary packages does not currently play nice with built from source package, conflict until they can get along

---- Files affected:
packages/chromium-browser-bin:
   chromium-browser-bin.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/chromium-browser-bin/chromium-browser-bin.spec
diff -u packages/chromium-browser-bin/chromium-browser-bin.spec:1.31 packages/chromium-browser-bin/chromium-browser-bin.spec:1.32
--- packages/chromium-browser-bin/chromium-browser-bin.spec:1.31	Fri Jun 25 15:36:03 2010
+++ packages/chromium-browser-bin/chromium-browser-bin.spec	Fri Jun 25 15:47:26 2010
@@ -28,6 +28,7 @@
 Requires:	nss
 Requires:	xdg-utils
 Provides:	wwwbrowser
+Conflicts:	chromium-browser
 Obsoletes:	%{name}-bookmark_manager
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -184,6 +185,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/06/25 13:47:26  caleb
+- Binary packages does not currently play nice with built from source package, conflict until they can get along
+
 Revision 1.31  2010/06/25 13:36:03  caleb
 - Obsoletes previously subpackaged now internal bookmark_manager
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser-bin/chromium-browser-bin.spec?r1=1.31&r2=1.32&f=u