[gnome-themes/f15/master] drop a11y themes

Matthias Clasen mclasen at fedoraproject.org
Tue Mar 8 13:26:31 UTC 2011


commit 99d5e47c4353e5fc895f0dc909fbb57e861d808c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Mar 8 08:09:08 2011 -0500

    drop a11y themes

 gnome-themes.spec |   52 +++++++++++++++++++++++-----------------------------
 1 files changed, 23 insertions(+), 29 deletions(-)
---
diff --git a/gnome-themes.spec b/gnome-themes.spec
index 9c34a71..05726be 100644
--- a/gnome-themes.spec
+++ b/gnome-themes.spec
@@ -1,7 +1,7 @@
 Summary: Themes for GNOME
 Name: gnome-themes
 Version: 2.32.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://download.gnome.org/sources/gnome-themes/
 #VCS: git:git://git.gnome.org/gnome-themes
 Source: http://download.gnome.org/sources/gnome-themes/2.32/%{name}-%{version}.tar.bz2
@@ -55,6 +55,22 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/themes/ThinIce/ICON.png
 # Remove the test theme
 rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/ClearlooksTest/
 
+# Accessibility themes are now in gnome-themes-standard
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/HighContrast/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/HighContrastInverse/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/HighContrastLargePrint/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/HighContrastLargePrintInverse
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/LowContrast/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/LowContrastLargePrint
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/Inverted/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/LargePrint
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/HighContrast/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/HighContrastInverse/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/HighContrastLargePrint/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/HighContrastLargePrintInverse/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/HighContrast-SVG/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/LargePrint/
+
 # add legacy symlinks
 for size in 16x16 22x22 24x24 32x32 48x48 256x256; do
   for context in actions apps devices places status; do
@@ -76,31 +92,20 @@ done
 %find_lang %{name}
 
 %post
-for icon_theme in \
-  Clearlooks ClearlooksClassic Crux Mist Glider Glossy \
-  HighContrast HighContrastInverse HighContrastLargePrint HighContrastLargePrintInverse \
-  Inverted LargePrint LowContrast LowContrastLargePrint Simple ; do
+for icon_theme in Crux Mist ; do
   touch --no-create %{_datadir}/icons/${icon_theme} &> /dev/null || :
 done
 
 %postun
 if [ $1 -eq 0 ]; then
-for icon_theme in \
-  Crux HighContrast HighContrastInverse HighContrastLargePrint \
-  HighContrastLargePrintInverse HighContrast-SVGLargePrint Mist \
-  ;
-do
+for icon_theme in Crux Mist ; do
   touch --no-create %{_datadir}/icons/${icon_theme} &> /dev/null || :
   gtk-update-icon-cache %{_datadir}/icons/${icon_theme} &> /dev/null || :
 done
 fi
 
 %posttrans
-for icon_theme in \
-  Crux HighContrast HighContrastInverse HighContrastLargePrint \
-  HighContrastLargePrintInverse HighContrast-SVGLargePrint Mist \
-  ;
-do
+for icon_theme in Crux Mist ; do
   gtk-update-icon-cache %{_datadir}/icons/${icon_theme} &> /dev/null || :
 done
 
@@ -108,12 +113,6 @@ done
 %files -f  %{name}.lang
 %defattr(-,root,root,-)
 %{_datadir}/icons/Crux/
-%{_datadir}/icons/HighContrast/
-%{_datadir}/icons/HighContrastInverse/
-%{_datadir}/icons/HighContrastLargePrint/
-%{_datadir}/icons/HighContrastLargePrintInverse/
-%{_datadir}/icons/HighContrast-SVG/
-%{_datadir}/icons/LargePrint/
 %{_datadir}/icons/Mist/
 
 # themes where the gtk theme is shipped with the engine
@@ -125,14 +124,6 @@ done
 %{_datadir}/themes/Glider
 %{_datadir}/themes/Glossy
 %{_datadir}/themes/ClearlooksClassic
-%{_datadir}/themes/HighContrast
-%{_datadir}/themes/HighContrastInverse
-%{_datadir}/themes/HighContrastLargePrint
-%{_datadir}/themes/HighContrastLargePrintInverse
-%{_datadir}/themes/Inverted
-%{_datadir}/themes/LargePrint
-%{_datadir}/themes/LowContrast
-%{_datadir}/themes/LowContrastLargePrint
 %{_datadir}/themes/Simple
 
 %doc AUTHORS COPYING NEWS README
@@ -140,6 +131,9 @@ done
 %files legacy -f legacy.txt
 
 %changelog
+* Tue Mar  8 2011 Matthias Clasen <mclasen at redhat.com> - 2.32.0-5
+- Drop accessibility themes to avoid conflict with gnome-themes-standard
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.32.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list