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

[Germán A. Racca]

commit 33c931bc05580d0406832e29bd2dac95e47aa256
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Wed Apr 20 16:38:19 2011 -0300

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

 .gitignore              |    2 +
 gtk-equinox-engine.spec |   59 +++++++++++++++++++++++++++++-----------------
 sources                 |    3 +-
 3 files changed, 41 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8a4646..05ed499 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 121881-equinox-1.20.tar.bz2
 /121881-equinox-1.20.tar.bz2
 /121881-equinox-1.30.tar.bz2
+/121881-equinox-1.40.tar.gz
+/140449-equinox-themes-1.40.tar.gz
diff --git a/gtk-equinox-engine.spec b/gtk-equinox-engine.spec
index 1b22928..d894e18 100644
--- a/gtk-equinox-engine.spec
+++ b/gtk-equinox-engine.spec
@@ -1,63 +1,78 @@
 %global engine equinox
 %global tarname 121881-%{engine}
-%global tarver 1.30
+%global tarver 1.40
+%global tarthemes 140449-%{engine}-themes
 
-Name:		gtk-equinox-engine
-Version:	1.30.2
-Release:	1%{?dist}
-Summary:	Equinox theme engine for GTK+ 2.x
+Name:           gtk-equinox-engine
+Version:        1.40
+Release:        1%{?dist}
+Summary:        Equinox theme engine for GTK+ 2.x
 
-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
 effects, subtle shadows, rounded widgets.
 
 %prep
-%setup -q -c %{tarname}-%{tarver}.tar.bz2
-tar -xzf %{engine}-gtk-engine.tar.gz
-tar -xzf %{engine}-themes.tar.gz
+%setup -q -n %{engine}-%{tarver}
+
+# Unpack gtk themes here
+tar -xzf %{SOURCE1}
 
 # Fix executable bits for debuginfo package
-chmod 0644 %{engine}-%{tarver}/src/*
+chmod 0644 src/*
 
 %build
-pushd %{engine}-%{tarver}
 %configure --enable-animation
 make %{?_smp_mflags}
-popd
 
 %install
-pushd %{engine}-%{tarver}
 make install DESTDIR=%{buildroot}
-popd
 
 # Copy themes to proper directory
 mkdir -p %{buildroot}%{_datadir}/themes
-cp -r Equinox* %{buildroot}%{_datadir}/themes/
+mkdir -p tmpdoc
+mv *.crx tmpdoc
+mv Equinox* %{buildroot}%{_datadir}/themes
 
 # Remove .la files
 find %{buildroot} -name *.la | xargs rm -f || true
 
+# Fix executable bits for files in themes
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution/README
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution\ Dawn/index.theme
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution\ Midnight/index.theme
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution\ Midnight/README
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution\ Midnight/gtk-2.0/apps/gnome-panel.rc
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution\ Midnight/gtk-2.0/apps/google-chrome.rc
+chmod 0644 %{buildroot}%{_datadir}/themes/Equinox\ Evolution\ Midnight/gtk-2.0/fixes/fixes.rc
+
 # Fix executable bits for doc files
-chmod 0644 %{engine}-%{tarver}/{AUTHORS,ChangeLog,COPYING}
+chmod 0644 AUTHORS ChangeLog COPYING README
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README Equinox\ Evolution.crx userChrome.css
-%doc %{engine}-%{tarver}/{AUTHORS,ChangeLog,COPYING}
+%doc AUTHORS ChangeLog COPYING README tmpdoc/*
 %{_libdir}/gtk-2.0/2.10.0/engines/libequinox.so
 %{_datadir}/themes/Equinox*
 
 %changelog
+* 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
+
 * Mon Oct 04 2010 Germán A. Racca <skytux at fedoraproject.org> 1.30.2-1
 - Updated to new version
 - Defined some globals
diff --git a/sources b/sources
index 7bf386c..cdfee20 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-07d43dede6bdc17ba74f1740a3743601  121881-equinox-1.30.tar.bz2
+8f4bf857d0ff559804a4aec215d54c27  121881-equinox-1.40.tar.gz
+d646f34aee2356fd03e3eb81e031c863  140449-equinox-themes-1.40.tar.gz