[gnome-themes-standard/f17] fix up handling of icon themes
Matthias Clasen
mclasen at fedoraproject.org
Fri May 11 20:34:50 UTC 2012
commit 8e7786a9c870b4802d767cd243d4265f9601aaf8
Author: Matthias Clasen <mclasen at redhat.com>
Date: Fri May 11 16:35:36 2012 -0400
fix up handling of icon themes
gnome-themes-standard.spec | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/gnome-themes-standard.spec b/gnome-themes-standard.spec
index 288294b..0329b0b 100644
--- a/gnome-themes-standard.spec
+++ b/gnome-themes-standard.spec
@@ -1,6 +1,6 @@
Name: gnome-themes-standard
Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Standard themes for GNOME applications
Group: User Interface/Desktops
@@ -66,6 +66,11 @@ make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
+for t in HighContrast HighContrastInverse LowContrast; do
+ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/$t/icon-theme.cache
+ touch $RPM_BUILD_ROOT%{_datadir}/icons/$t/icon-theme.cache
+done
+
rm $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.0.0/theming-engines/libadwaita.la
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-3.0
@@ -76,25 +81,18 @@ cp $RPM_SOURCE_DIR/gtkrc $RPM_BUILD_ROOT%{_sysconfdir}/gtk-2.0/gtkrc
%find_lang %{name}
%post
-touch --no-create %{_datadir}/icons/Adwaita &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
- for t in Adwaita HighContrast HighContrastInverse LowContrast; do
- touch --no-create %{_datadir}/icons/$t &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
- done
-fi
+for t in HighContrast HighContrastInverse LowContrast; do
+ touch --no-create %{_datadir}/icons/$t &>/dev/null || :
+done
%posttrans
-for t in Adwaita HighContrast HighContrastInverse LowContrast; do
+for t in HighContrast HighContrastInverse LowContrast; do
gtk-update-icon-cache %{_datadir}/icons/$t &>/dev/null || :
done
%files -f %{name}.lang
%doc COPYING NEWS
-
# Background and WM
%{_datadir}/themes/Adwaita
%exclude %{_datadir}/themes/Adwaita/gtk-3.0
@@ -104,10 +102,15 @@ done
%{_datadir}/gnome-background-properties/*
# A11y themes
+%ghost %{_datadir}/icons/LowContrast/icon-theme.cache
%{_datadir}/icons/LowContrast
%{_datadir}/themes/LowContrast
+
+%ghost %{_datadir}/icons/HighContrast/icon-theme.cache
%{_datadir}/icons/HighContrast
%{_datadir}/themes/HighContrast
+
+%ghost %{_datadir}/icons/HighContrastInverse/icon-theme.cache
%{_datadir}/icons/HighContrastInverse
%{_datadir}/themes/HighContrastInverse
@@ -131,6 +134,9 @@ done
%changelog
+* Fri May 11 2012 Matthias Clasen <mclasen at redhat.com> - 3.4.1-2
+- Fix handling of icon caches to be the same as elsewhere
+
* Mon Apr 16 2012 Richard Hughes <hughsient at gmail.com> - 3.4.1-1
- Update to 3.4.1
More information about the scm-commits
mailing list