From becd981437793e396b34706e27eb3733145ef869 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 19 Apr 2010 00:05:58 +0000
Subject: [PATCH] 2.30.1

---
 .cvsignore            |  2 +-
 gnome-icon-theme.spec | 72 +++++--------------------------------------
 sources               |  2 +-
 3 files changed, 9 insertions(+), 67 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index db051ac..d193b4a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-icon-theme-2.30.0.tar.bz2
+gnome-icon-theme-2.30.1.tar.bz2
diff --git a/gnome-icon-theme.spec b/gnome-icon-theme.spec
index 6d7a3d4..317b330 100644
--- a/gnome-icon-theme.spec
+++ b/gnome-icon-theme.spec
@@ -1,7 +1,7 @@
 Summary: GNOME icon theme
 Name: gnome-icon-theme
-Version: 2.30.0
-Release: 2%{?dist}
+Version: 2.30.1
+Release: 1%{?dist}
 #VCS: git:git://git.gnome.org/gnome-icon-theme
 Source0: http://download.gnome.org/sources/gnome-icon-theme/2.30/%{name}-%{version}.tar.bz2
 Source1: gnome-icon-theme-extra-device-icons-5.tar.bz2
@@ -31,74 +31,13 @@ This package contains the default icon theme used by the GNOME desktop.
 %configure
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-## remove these bogus files
-rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
-
-# create symlinks for gtk stock icons, these are not really 'legacy'
-# this uses the legacy-icon-mapping.xml file in cvs
-cd $RPM_BUILD_ROOT/usr/share/icons/gnome
-for size in 8x8 16x16 22x22 24x24 32x32 48x48 256x256; do
-  (
-  cd $size
-  for context in *; do
-    if [ -d $context ]; then
-      (
-      cd $context
-      INU_DATA_DIR=$RPM_SOURCE_DIR /usr/bin/icon-name-mapping -c $context
-      )
-    fi
-  done
-  )
-done
-
-tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE1}
-cp %{SOURCE3} $RPM_BUILD_ROOT/usr/share/icons/gnome/16x16/apps
-tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE4}
-tar xj -C $RPM_BUILD_ROOT/usr/share/icons/gnome -f %{SOURCE5}
-
-sed -i -e 's#^\(Directories=.*\)$#\1,scalable/apps,scalable/actions,scalable/devices,scalable/status#' $RPM_BUILD_ROOT/usr/share/icons/gnome/index.theme
-
-cat >>$RPM_BUILD_ROOT/usr/share/icons/gnome/index.theme <<EOF
-[scalable/apps]
-Size=48
-MinSize=32
-MaxSize=256
-Context=Applications
-Type=Scalable
-
-[scalable/actions]
-Size=48
-MinSize=32
-MaxSize=256
-Context=Actions
-Type=Scalable
-
-[scalable/devices]
-Size=48
-MinSize=32
-MaxSize=256
-Context=Devices
-Type=Scalable
-
-[scalable/status]
-Size=48
-MinSize=32
-MaxSize=256
-Context=Status
-Type=Scalable
-EOF
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %posttrans
-/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
 
 %postun
-/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
 
 %files
 %defattr(-,root,root)
@@ -108,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 18 2010 Matthias Clasen <mclasen@redhat.com> 2.30.1-1
+- Update to 2.30.1
+
 * Fri Apr  2 2010 Matthias Clasen <mclasen@redhat.com> 2.30.0-2
 - Fix a zoom icon
 
diff --git a/sources b/sources
index 1cf8b69..b0658e5 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5c66c4c5b85f26ccc9411e1c934525f3  gnome-icon-theme-2.30.0.tar.bz2
+ffab20f9be63e2ac0a08eb65215bb647  gnome-icon-theme-2.30.1.tar.bz2
 320a621c6b9070c4b2666492149b9735  lost-icons.tar.bz2
 824f011a845100714eb8a47199cf4398  gnome-icon-theme-extra-device-icons-5.tar.bz2
 3a2837cf20fc206d3a7b963661fcf4ce  gtk_print_icons.tar.bz2