[gtk-equinox-engine: 2/2] Updated to new version Removed old gtk themes and added new ones Added dependency on Faenza icons

[Germán A. Racca]

commit d37b9989eb4f881a87f8b16df6f2c915a300d4cc
Merge: dc00779 61602a1
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Wed Apr 20 16:14:42 2011 -0300

    Updated to new version
    Removed old gtk themes and added new ones
    Added dependency on Faenza icons

 gtk-equinox-engine.spec |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc gtk-equinox-engine.spec
index d894e18,d3d3d32..f88338c
--- a/gtk-equinox-engine.spec
+++ b/gtk-equinox-engine.spec
@@@ -1,21 -1,18 +1,28 @@@
  %global engine equinox
  %global tarname 121881-%{engine}
 -%global tarver 1.30
 +%global tarver 1.40
 +%global tarthemes 140449-%{engine}-themes
  
++<<<<<<< HEAD
 +Name:           gtk-equinox-engine
 +Version:        1.40
 +Release:        1%{?dist}
 +Summary:        Equinox theme engine for GTK+ 2.x
++=======
+ Name:		gtk-equinox-engine
+ Version:	1.30.2
+ Release:	2%{?dist}
+ Summary:	Equinox theme engine for GTK+ 2.x
++>>>>>>> 61602a1fbac0310d04ce73378642af5b239b0722
  
 -Group:		System Environment/Libraries
 -License:	GPLv2+
 -URL:		http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881
 -Source0:	http://gnome-look.org/CONTENT/content-files/%{tarname}-%{tarver}.tar.bz2
 +Group:          System Environment/Libraries
 +License:        GPLv2+
 +URL:            http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881
 +Source0:        http://gnome-look.org/CONTENT/content-files/%{tarname}-%{tarver}.tar.gz
 +Source1:        http://gnome-look.org/CONTENT/content-files/%{tarthemes}-%{tarver}.tar.gz
  
 -BuildRequires:	gtk2-devel
 +BuildRequires:  gtk2-devel
 +Requires:       faenza-icon-theme
  
  %description
  A new engine derived from Aurora 1.4. It features smooth gradients or glassy
@@@ -68,10 -58,8 +75,15 @@@ rm -rf %{buildroot
  %{_datadir}/themes/Equinox*
  
  %changelog
++<<<<<<< HEAD
 +* Thu Apr 20 2011 Germán A. Racca <skytux at fedoraproject.org> 1.40-1
 +- Updated to new version
 +- Removed old gtk themes and added new ones
 +- Added dependency on Faenza icons
++=======
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.30.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
++>>>>>>> 61602a1fbac0310d04ce73378642af5b239b0722
  
  * Mon Oct 04 2010 Germán A. Racca <skytux at fedoraproject.org> 1.30.2-1
  - Updated to new version