[mate-themes/f20: 12/12] solve merge conflict

[Wolfgang Ulbrich]

commit c906bf0a177970186b81edbd8dcb3dc716aed65e
Merge: bc40097 074c173
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri May 16 02:52:58 2014 +0200

    solve merge conflict

 .gitignore       |    8 ++++++++
 mate-themes.spec |   34 ++++++++++++++++++++++++----------
 sources          |    4 ++++
 3 files changed, 36 insertions(+), 10 deletions(-)
---
diff --cc .gitignore
index 698c764,4149de5..9a92954
--- a/.gitignore
+++ b/.gitignore
@@@ -9,4 -9,8 +9,12 @@@
  /mate-themes-1.7.1.tar.xz
  /mate-themes-1.7.2.git8a12f75.tar.xz
  /mate-themes-1.7.2.git27da094.tar.xz
++<<<<<<< HEAD
 +/mate-themes-1.7.3-git20140304-5a900ef.tar.xz
++=======
+ /mate-themes-1.7.2.tar.xz
+ /mate-themes-1.7.90.tar.xz
+ /mate-themes-1.8.0.tar.xz
+ /mate-themes-1.8.1-git20140304-5a900ef.tar.xz
+ /mate-themes-1.8.1.tar.xz
++>>>>>>> master
diff --cc mate-themes.spec
index 061ef6e,b370228..8c79b24
--- a/mate-themes.spec
+++ b/mate-themes.spec
@@@ -49,9 -49,9 +49,8 @@@ MATE Desktop theme
  %setup -q%{!?rel_build:n %{name}-%{commit}}
  
  # needed for git snapshots
- NOCONFIGURE=1 ./autogen.sh
- 
+ #NOCONFIGURE=1 ./autogen.sh
  
 -
  %build
  %configure --enable-all-themes   \
             --enable-test-themes  \
@@@ -66,9 -66,9 +65,8 @@@ make %{?_smp_mflags} V=
  find %{buildroot} -name '*.la' -exec rm -rf {} ';'
  find %{buildroot} -name '*.a' -exec rm -rf {} ';'
  
- %find_lang %{name}
- 
+ %find_lang %{name} --with-gnome --all-name
  
 -
  %post
  for icon_theme in \
    Fog Quid \
@@@ -141,7 -144,17 +142,20 @@@ don
  - add better git snapshot usage
  - BlackMATE, GreenLaguna, Menta and BlueMenta supports now GTk3-3.10
  - Good bye adwaita engine warning
+ 
+ * Wed Mar 05 2014 Dan Mashal <dan.mashal at fedoraproject.org> - 1.8.0-1
+ - Update to 1.8.0
+ 
+ * Wed Feb 19 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.90-1
+ - update to 1.7.90
+ 
++* Wed Mar 05 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.3-0.1.git20140304.5a900e
++- use modern 'make install' macro
++
+ * Sat Jan 18 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.2-1
+ - update to 1.7.2
  - use modern 'make install' macro
+ - add --with-gnome --all-name for find language
  
  * Sun Nov 24 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.7.2-0.2.git27da094
  - update to latest git snapshot
diff --cc sources
index 85fcef2,ba7d3bb..720b0f5
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +e5943c625aea07bef8c012a725e9df8e  mate-themes-1.7.3-git20140304-5a900ef.tar.xz
++=======
+ 5c348c11eb78c0ee0442ee429132d2c7  mate-themes-1.8.1.tar.xz
++>>>>>>> master