From a38da3c109840f1d7730d1820c11d107b6be60ce Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 7 Feb 2006 18:52:17 +0000
Subject: [PATCH] Add missing icons

---
 .cvsignore            |  2 ++
 gnome-icon-theme.spec | 57 +++++++++++++++++--------------------------
 sources               |  2 +-
 3 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index fa4fadf..ef9fd75 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,5 @@ gnome-icon-theme-2.13.4.tar.bz2
 gnome-icon-theme-2.13.5.tar.bz2
 gnome-icon-theme-2.13.5.1.tar.bz2
 gnome-icon-theme-2.13.7.tar.bz2
+external-icons-2.13.90-1.tar.gz
+external-icons-2.13.7.tar.gz
diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index c24fa17..01c4c54 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,9 +1,9 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.13.7
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
-Source1: external-icons-2.10.1-2.tar.gz
+Source1: external-icons-2.13.7.tar.gz
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -37,40 +37,25 @@ cp -rf hicolor $RPM_BUILD_ROOT%{_datadir}/icons/
 ## remove these bogus files
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
 
-## create symlinks so the gnome theme covers some extra icons we've added
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+for i in 48x48 24x24; do 
+## create symlinks so the all icon themes know some extra icons we've added
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
 
-ln -s gnome-util.png redhat-accessories.png
-#ln -s %{_datadir}/pixmaps/.png redhat-extras.png
-ln -s gnome-joystick.png redhat-games.png
-ln -s gnome-graphics.png redhat-graphics.png
+ln -s ../../../gnome/$i/apps/gnome-util.png redhat-accessories.png
+ln -s ../../../gnome/$i/apps/gnome-joystick.png redhat-games.png
+ln -s ../../../gnome/$i/apps/gnome-graphics.png redhat-graphics.png
 ln -s ../../../../pixmaps/gnome-home.png redhat-home.png
-ln -s gnome-globe.png redhat-internet.png
-ln -s gnome-desktop-config.png redhat-preferences.png
-ln -s gnome-applications.png redhat-office.png
-ln -s gnome-devel.png redhat-programming.png
-ln -s gnome-server-config.png redhat-server_settings.png
-ln -s gnome-multimedia.png redhat-sound_video.png
-ln -s gnome-starthere.png redhat-starthere.png
-ln -s gnome-system-config.png redhat-system_settings.png
-ln -s gnome-system.png redhat-system_tools.png
-#ln -s %{_datadir}/pixmaps/.png redhat-tools.png
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems
-
-rm -f gnome-fs-locally-shared.png
-rm -f gnome-fs-share-private.png
-ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png
-ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems
-
-rm -f gnome-fs-locally-shared.png rm -f gnome-fs-share-private.png
-ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png
-ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png
+ln -s ../../../gnome/$i/apps/gnome-globe.png redhat-internet.png
+ln -s ../../../gnome/$i/apps/gnome-desktop-config.png redhat-preferences.png
+ln -s ../../../gnome/$i/apps/gnome-applications.png redhat-office.png
+ln -s ../../../gnome/$i/apps/gnome-devel.png redhat-programming.png
+ln -s ../../../gnome/$i/apps/gnome-server-config.png redhat-server_settings.png
+ln -s ../../../gnome/$i/apps/gnome-multimedia.png redhat-sound_video.png
+ln -s ../../../gnome/$i/apps/gnome-starthere.png redhat-starthere.png
+ln -s ../../../gnome/$i/apps/gnome-system-config.png redhat-system_settings.png
+ln -s ../../../gnome/$i/apps/gnome-system.png redhat-system_tools.png
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +76,10 @@ done
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Feb  7 2006 Matthias Clasen <mclasen@redhat.com> 2.13.7-2
+- Add back some icons that went missing
+- Fix redhat- symlinks that were broken since FC1
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen@redhat.com> 2.13.7-1
 - Update to 2.13.7
 
diff --git a/sources b/sources
index 167bf05..50f35e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e6c3328995f2ce73ee91d1a654198f3f  external-icons-2.10.1-2.tar.gz
 65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2
+8374adf91a28e2f56888672f74d80a52  external-icons-2.13.7.tar.gz