SPECS: skype-static.spec - reverted blekot's commit (means re-adde...

[shadzik]

Author: shadzik                      Date: Sun Mar 30 04:16:09 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- reverted blekot's commit (means re-added C: skype)
- removed P: skype (both packages provide /usr/bin/skype - they have to conflict! if you'd like to have both, change ones binary name)

---- Files affected:
SPECS:
   skype-static.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/skype-static.spec
diff -u SPECS/skype-static.spec:1.11 SPECS/skype-static.spec:1.12
--- SPECS/skype-static.spec:1.11	Sun Mar 30 00:31:17 2008
+++ SPECS/skype-static.spec	Sun Mar 30 06:16:04 2008
@@ -23,7 +23,7 @@
 # Source0-md5:	3f7e2d04947d46b13729cfbff45ef7ec
 Patch0:		%{name}-desktop.patch
 URL:		http://www.skype.com/
-Provides:	%{_altname}
+Conflicts:	skype
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -115,6 +115,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2008-03-30 04:16:04  shadzik
+- reverted blekot's commit (means re-added C: skype)
+- removed P: skype (both packages provide /usr/bin/skype - they have to conflict! if you'd like to have both, change ones binary name)
+
 Revision 1.11  2008-03-29 23:31:17  blekot
 - Provides and Conflicts shouldn't be the same (C removed)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/skype-static.spec?r1=1.11&r2=1.12&f=u