[faenza-icon-theme] update to 1.1 clean up specfile

[Felix Kaechele]

commit 9f7dbe958fce07b145646d938a02d67d0c4df726
Author: Felix Kaechele <heffer at fedoraproject.org>
Date:   Sun Oct 23 21:23:09 2011 +0200

    update to 1.1
    clean up specfile

 .gitignore             |    1 +
 faenza-icon-theme.spec |   89 +++++++++++++++++++++++++----------------------
 sources                |    2 +-
 3 files changed, 49 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a92f18..0d5de64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Faenza_Icons_by_tiheum.zip
+/faenza-icon-theme_1.1.tar.gz
diff --git a/faenza-icon-theme.spec b/faenza-icon-theme.spec
index 4fe7abc..4d849be 100644
--- a/faenza-icon-theme.spec
+++ b/faenza-icon-theme.spec
@@ -1,70 +1,75 @@
-%global tarname 128143-faenza
+%global themes Faenza Faenza-Dark Faenza-Darker Faenza-Darkest
 
 Name:           faenza-icon-theme
-Version:        0.6
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Icon theme designed for Equinox GTK theme
 
 Group:          User Interface/Desktops 
-License:        GPL+
-URL:            http://gnome-look.org/content/show.php/Faenza?content=128143
-Source0:        http://www.deviantart.com/download/173323228/Faenza_Icons_by_tiheum.zip
+License:        GPLv3
+URL:            http://tiheum.deviantart.com/art/Faenza-Icons-173323228
+Source0:        https://faenza-icon-theme.googlecode.com/files/%{name}_%{version}.tar.gz
 BuildArch:      noarch
 
 %description
 Contains icons for Equinox GTK theme
 
+
 %prep
-%setup -q -c %{tarname}-%{version} 
-tar xf Faenza.tar.gz
-tar xf Faenza-Dark.tar.gz
+%setup -q -c
+# fix permissions
+find . -type d -exec chmod 0755 {} \;
+find . -type f -exec chmod 0644 {} \;
 
-%build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-cd ./Faenza/places/scalable/ && ln -sf distributor-logo-fedora.svg distributor-logo.svg && cd ../../..
-cd ./Faenza/places/48/ && ln -sf distributor-logo-fedora.png distributor-logo.png && cd ../../..
-cd ./Faenza/places/32/ && ln -sf distributor-logo-fedora.png distributor-logo.png && cd ../../..
-cd ./Faenza/places/24/ && ln -sf distributor-logo-fedora.png distributor-logo.png && cd ../../..
-cd ./Faenza/places/22/ && ln -sf distributor-logo-fedora.png distributor-logo.png && cd ../../..
-cd ./Faenza/places/16/ && ln -sf distributor-logo-fedora.png distributor-logo.png && cd ../../..
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons
-cp -a ./Faenza/ $RPM_BUILD_ROOT%{_datadir}/icons
-cp -a ./Faenza-Dark/ $RPM_BUILD_ROOT%{_datadir}/icons
-chmod 0644 $RPM_BUILD_ROOT%{_datadir}/icons/Faenza/index.theme
-chmod 0644 $RPM_BUILD_ROOT%{_datadir}/icons/Faenza-Dark/index.theme
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post  
-touch --no-create %{_datadir}/icons/Faenza &>/dev/null ||:
-touch --no-create %{_datadir}/icons/Faenza-Dark &>/dev/null ||:
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons
+
+# link the distributor-icon to the Fedora icon
+for icon in ./*/places/*/distributor-logo-fedora.*
+do
+    pushd $(dirname ${icon})
+        ln -sf $(basename ${icon}) distributor-logo.${icon##*.}
+    popd
+done
+
+cp -a Faenza* $RPM_BUILD_ROOT%{_datadir}/icons
+
+
+%post
+for theme in %{themes}
+do
+    touch --no-create %{_datadir}/icons/${theme} &>/dev/null ||:
+done
 
 
 %postun
-if [ $1 -eq 0 ] ; then 
-        touch --no-create %{_datadir}/icons/Faenza &>/dev/null
-        gtk-update-icon-cache -q %{_datadir}/icons/Faenza &>/dev/null || : 
+if [ $1 -eq 0 ] ; then
+    for theme in %{themes}
+    do
+        touch --no-create %{_datadir}/icons/${theme} &>/dev/null
+        gtk-update-icon-cache -q %{_datadir}/icons/${theme} &>/dev/null || :
+    done
 fi
 
-if [ $1 -eq 0 ] ; then 
-        touch --no-create %{_datadir}/icons/Faenza-Dark &>/dev/null
-        gtk-update-icon-cache -q %{_datadir}/icons/Faenza-Dark &>/dev/null || : 
-fi
 
 %posttrans
-gtk-update-icon-cache %{_datadir}/icons/Faenza &>/dev/null || :
-gtk-update-icon-cache %{_datadir}/icons/Faenza-Dark &>/dev/null || :
+for theme in %{themes}
+do
+    gtk-update-icon-cache %{_datadir}/icons/${theme} &>/dev/null || :
+done
+
 
 %files
-%defattr(-,root,root,-)
-%{_datadir}/icons/Faenza/*
-%{_datadir}/icons/Faenza-Dark/*
-%doc COPYING.txt
+%doc AUTHORS ChangeLog COPYING README
+%{_datadir}/icons/Faenza*
+
 
 %changelog
+* Fri Oct 14 2011 Felix Kaechele <heffer at fedoraproject.org> - 1.1-1
+- update to 1.1
+- clean up specfile
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index bb6fc4b..f9bb16d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03df1ecd4e3555f175edd83ed63aa811  Faenza_Icons_by_tiheum.zip
+a7385a92226a3b3ab3949952149fe3a3  faenza-icon-theme_1.1.tar.gz