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

[Wolfgang Ulbrich]

commit 1b5778d548753061468fb0b1052af262054380f1
Merge: f214eb3 7c41176
Author: raveit65 <chat-to-me at raveit.de>
Date:   Mon Aug 26 22:06:54 2013 +0200

    Merge branch 'master' into f18

 mate-icon-theme-pkgconfig_dir.patch |   12 ++++++++++++
 mate-icon-theme.spec                |   26 +++++++++++++++++---------
 2 files changed, 29 insertions(+), 9 deletions(-)
---
diff --cc mate-icon-theme.spec
index 91895e5,fb5d5c5..32fa870
--- a/mate-icon-theme.spec
+++ b/mate-icon-theme.spec
@@@ -16,10 -20,12 +20,15 @@@ Patch1: mate-icon-theme-pkgconfig_dir.p
  BuildRequires:  mate-common 
  BuildRequires:  icon-naming-utils
  
+ Obsoletes: mate-icon-theme-devel < 1.6.2-0.2
+ Provides:  mate-icon-theme-devel = %{version}-%{release}
+ # ship a .pc file but avoid a dep on pkg-config
+ %global __requires_exclude pkg-config
+ 
  
 +Provides: mate-icon-theme = %{version}-%{release}
 +Obsoletes: mate-icon-theme-legacy < %{version}-%{release}
 +
  %description
  Icon theme for MATE Desktop