[mate-icon-theme/f18: 4/4] Merge branch 'master' into f18

[Wolfgang Ulbrich]

commit 2fa2146b03abbd9e92620713cbb8cd8089b15de0
Merge: 81798d4 60bace9
Author: raveit65 <chat-to-me at raveit.de>
Date:   Mon Aug 5 13:27:53 2013 +0200

    Merge branch 'master' into f18

 mate-icon-theme.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc mate-icon-theme.spec
index 04e1011,f2da813..f54ae51
--- a/mate-icon-theme.spec
+++ b/mate-icon-theme.spec
@@@ -11,11 -11,7 +11,10 @@@ BuildArch:      noarc
  BuildRequires:  mate-common 
  BuildRequires:  icon-naming-utils
  
- Provides: mate-icon-theme = %{version}-%{release}
  
 +Provides: mate-icon-theme = %{version}-%{release}
 +Obsoletes: mate-icon-theme-legacy < %{version}-%{release}
 +
  %description
  Icon theme for MATE Desktop