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

[Dan Mashal]

commit 2eb40ecb7905fd08c4b6a768a66cf81b61721f68
Merge: 26e295e 4d16747
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Nov 5 22:34:23 2012 -0800

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-icon-theme.spec

 .gitignore           |    1 +
 mate-icon-theme.spec |   28 ++++++++++++++++++----------
 sources              |    2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)
---
diff --cc mate-icon-theme.spec
index 5dd5bea,709af1e..560fb7b
--- a/mate-icon-theme.spec
+++ b/mate-icon-theme.spec
@@@ -1,18 -1,19 +1,22 @@@
- Name:		mate-icon-theme
- Version:	1.4.0
- Release:	6%{?dist}
- Summary:	Icon theme for MATE Desktop
- License:	GPLv2+ and LGPLv2+
- URL:		http://mate-desktop.org
- Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+ Name:           mate-icon-theme
+ Version:        1.5.0
+ Release:        1%{?dist}
+ Summary:        Icon theme for MATE Desktop
+ License:        GPLv2+ and LGPLv2+
+ URL:            http://mate-desktop.org
+ Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
  
- BuildArch:	noarch
+ BuildArch:      noarch
  
- BuildRequires:	mate-common icon-naming-utils
+ BuildRequires:  mate-common 
+ BuildRequires:  icon-naming-utils
+ 
+ Provides: mate-icon-theme = %{version}-%{release}
+ Obsoletes: mate-icon-theme-legacy < %{version}-%{release}
  
 +Provides: mate-icon-theme = %{version}-%{release}
 +Obsoletes: mate-icon-theme-legacy < %{version}-%{release}
 +
  %description
  Icon theme for MATE Desktop