rpms/gnome-themes/devel .cvsignore, 1.90, 1.91 gnome-themes.spec, 1.156, 1.157 sources, 1.97, 1.98

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-themes/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7471

Modified Files:
	.cvsignore gnome-themes.spec sources 
Log Message:
add new, better mist icons



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/.cvsignore,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- .cvsignore	30 Mar 2010 01:18:20 -0000	1.90
+++ .cvsignore	30 Mar 2010 06:12:11 -0000	1.91
@@ -1 +1 @@
-gnome-themes-2.30.0.tar.bz2
+mist-icons.tar.bz2


Index: gnome-themes.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/gnome-themes.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- gnome-themes.spec	30 Mar 2010 01:43:56 -0000	1.156
+++ gnome-themes.spec	30 Mar 2010 06:12:12 -0000	1.157
@@ -1,13 +1,12 @@
 Summary: Themes for GNOME
 Name: gnome-themes
 Version: 2.30.0
-Release: 1%{?dist}
+Release: 2%{?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.30/%{name}-%{version}.tar.bz2
 # Icons done by Andreas Nilsson for http://live.gnome.org/GnomeArt/ArtRequests/issue26
-# svg versions done by Maureen Duffy
-Source2: mist-folders-xdg.tar.gz
+Source2: mist-icons.tar.bz2
 License: LGPLv2 and GPLv2
 Group: User Interface/Desktops
 BuildArch: noarch
@@ -55,11 +54,133 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/themes/
 rm -rf $RPM_BUILD_ROOT%{_datadir}/themes/ClearlooksTest/
 
 # Put extra Mist folder icons in place
-tar xzf %{SOURCE2}
-cp mist-folders-xdg/16x16/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/16x16/places
-cp mist-folders-xdg/24x24/*.png $RPM_BUILD_ROOT%{_datadir}/icons/Mist/24x24/places
-cp mist-folders-xdg/scalable/*.svg $RPM_BUILD_ROOT%{_datadir}/icons/Mist/32x32/places
-cp mist-folders-xdg/scalable/*.svg $RPM_BUILD_ROOT%{_datadir}/icons/Mist/scalable/places
+tar xf %{SOURCE2}
+cp -R mist/* $RPM_BUILD_ROOT%{_datadir}/icons/Mist
+
+# add legacy symlinks
+for size in 16x16 22x22 24x24 32x32; do
+  for context in apps devices; do
+    (cd $RPM_BUILD_ROOT%{_datadir}/icons/Mist/$size
+     icon-name-mapping -c $context)
+  done
+done
+for size in 48x48 256x256; do
+  for context in apps devices actions places status; do
+    (cd $RPM_BUILD_ROOT%{_datadir}/icons/Mist/$size
+     icon-name-mapping -c $context)
+  done
+done
+
+# and make sure the directories are part of the theme
+sed -i -e 's#^\(Directories=.*\)$#\1,16x16/apps,16x16/devices,22x22/apps,22x22/devices,24x24/apps,24x24/devices,32x32/apps,32x32/devices,48x48/apps,48x48/devices,48x48/actions,48x48/places,48x48/status,256x256/apps,256x256/devices,256x256/actions,256x256/places,256x256/status#' $RPM_BUILD_ROOT%{_datadir}/icons/Mist/index.theme
+
+cat >>$RPM_BUILD_ROOT%{_datadir}/icons/Mist/index.theme <<EOF
+
+[16x16/apps]
+Context=Applications
+Size=16
+Type=Fixed
+
+[16x16/devices]
+Context=Devices
+Size=16
+Type=Fixed
+
+[22x22/apps]
+Context=Applications
+Size=22
+Type=Fixed
+
+[22x22/devices]
+Context=Devices
+Size=22
+Type=Fixed
+
+[24x24/apps]
+Context=Applications
+Size=24
+Type=Fixed
+
+[24x24/devices]
+Context=Devices
+Size=24
+Type=Fixed
+
+[32x32/apps]
+Context=Applications
+Size=32
+Type=Fixed
+
+[32x32/devices]
+Context=Devices
+Size=32
+Type=Fixed
+
+[48x48/actions]
+Context=Actions
+Size=48
+Type=Fixed
+
+[48x48/places]
+Context=Places
+Size=48
+Type=Fixed
+
+[48x48/status]
+Context=Status
+Size=48
+Type=Fixed
+
+[48x48/apps]
+Context=Applications
+Size=48
+Type=Fixed
+
+[48x48/devices]
+Context=Devices
+Size=48
+Type=Fixed
+
+[256x256/actions]
+Context=Actions
+Size=256
+MinSize=56
+MaxSize=512
+Type=Scalable
+
+[256x256/places]
+Context=Places
+Size=256
+MinSize=56
+MaxSize=512
+Type=Scalable
+
+[256x256/status]
+Context=Status
+Size=256
+MinSize=56
+MaxSize=512
+Type=Scalable
+
+[256x256/apps]
+Context=Applications
+Size=256
+MinSize=56
+MaxSize=512
+Type=Scalable
+
+[256x256/devices]
+Context=Devices
+Size=256
+MinSize=56
+MaxSize=512
+Type=Scalable
+EOF
+
+# drop the scalable directories to match gnome-icon-theme
+rm -rf $RPM_BUILD_ROOT%{_datadir}/icons/Mist/scalable
+sed -i -e 's#scalable/[^,]*,##g' $RPM_BUILD_ROOT%{_datadir}/icons/Mist/index.theme
+sed -i -e '/^\[scalable/,/^$/d' $RPM_BUILD_ROOT%{_datadir}/icons/Mist/index.theme
 
 # we want to own the icon caches
 for dir in $RPM_BUILD_ROOT%{_datadir}/icons/*; do
@@ -136,6 +257,9 @@ done
 %doc AUTHORS COPYING NEWS README
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-2
+- Add new, better Mist icons
+
 * Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-1
 - Update to 2.30.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-themes/devel/sources,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -p -r1.97 -r1.98
--- sources	30 Mar 2010 01:18:20 -0000	1.97
+++ sources	30 Mar 2010 06:12:14 -0000	1.98
@@ -1,2 +1,2 @@
 9515789b64e6674a7d7d9ffc5b1d91f5  gnome-themes-2.30.0.tar.bz2
-7ab4fcb568c768dd8818bb1caf097998  mist-folders-xdg.tar.gz
+61684a7282205985570f97414423018d  mist-icons.tar.bz2