rpms/redhat-artwork/devel redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch, NONE, 1.1 coverage-tool-links.xml, 1.2, 1.3 icon-coverage-linker.py, 1.1, 1.2 redhat-artwork.spec, 1.153, 1.154

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Sep 15 21:29:20 UTC 2006 

Author: johnp

Update of /cvs/dist/rpms/redhat-artwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24346

Modified Files:
	coverage-tool-links.xml icon-coverage-linker.py 
	redhat-artwork.spec 
Added Files:
	redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch 
Log Message:
- Fix up the linking script a bit
- Patch the index.theme file for Bluecurve so it adds the status directories


redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch:
 index.theme |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletion(-)

--- NEW FILE redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch ---
--- redhat-artwork-5.0.5/art/icon/Bluecurve/index.theme.add-dirs	2006-09-15 16:19:50.000000000 -0400
+++ redhat-artwork-5.0.5/art/icon/Bluecurve/index.theme	2006-09-15 17:22:38.000000000 -0400
@@ -18,7 +18,7 @@
 SmallSizes=16
 PanelDefault=48
 PanelSizes=16,32,48
-Directories=96x96/apps,96x96/devices,96x96/emblems,96x96/filesystems,96x96/mimetypes,64x64/actions,64x64/apps,64x64/stock,48x48/emblems,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,48x48/stock,36x36/apps,36x36/filesystems,32x32/apps,32x32/filesystems,32x32/actions,32x32/stock,24x24/actions,24x24/apps,24x24/filesystems,24x24/stock,24x24/mimetypes,24x24/devices,24x24/ooo,20x20/actions,20x20/apps,20x20/stock,16x16/actions,16x16/apps,16x16/filesystems,16x16/stock,16x16/mimetypes,16x16/devices,16x16/ooo
+Directories=96x96/apps,96x96/devices,96x96/emblems,96x96/filesystems,96x96/mimetypes,96x96/status,64x64/actions,64x64/apps,64x64/stock,64x64/status,48x48/emblems,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,48x48/stock,48x48/status,36x36/apps,36x36/filesystems,32x32/apps,32x32/filesystems,32x32/actions,32x32/stock,32x32/status,24x24/actions,24x24/apps,24x24/filesystems,24x24/stock,24x24/mimetypes,24x24/devices,24x24/ooo,24x24/status,20x20/actions,20x20/apps,20x20/stock,20x20/status,16x16/actions,16x16/apps,16x16/filesystems,16x16/stock,16x16/mimetypes,16x16/devices,16x16/ooo,16x16/status
 
 [16x16/actions]
 Size=16
@@ -55,6 +55,10 @@
 Size=16
 Type=Threshold
 
+[16x16/status]
+Size=16
+Type=Threshold
+
 [20x20/actions]
 Size=20
 Context=Actions
@@ -72,6 +76,10 @@
 Context=Stock
 Type=Threshold
 
+[20x20/status]
+Size=20
+Type=Threshold
+
 [24x24/actions]
 Size=24
 Context=Actions
@@ -104,6 +112,10 @@
 Context=Devices
 Type=Threshold
 
+[24x24/status]
+Size=24
+Type=Threshold
+
 [24x24/ooo]
 Size=24
 Type=Threshold
@@ -130,6 +142,10 @@
 Context=Stock
 Type=Threshold
 
+[32x32/status]
+Size=32
+Type=Threshold
+
 [36x36/apps]
 Size=36
 Context=Applications
@@ -141,6 +157,10 @@
 Context=FileSystems
 Type=Threshold
 
+[36x36/status]
+Size=36
+Type=Threshold
+
 [48x48/actions]
 Size=48
 Context=Actions
@@ -176,6 +196,10 @@
 Context=Stock
 Type=Threshold
 
+[48x48/status]
+Size=48
+Type=Threshold
+
 [64x64/actions]
 Size=64
 Context=Actions
@@ -191,6 +215,10 @@
 Context=Applications
 Type=Threshold
 
+[64x64/status]
+Size=64
+Type=Threshold
+
 [96x96/apps]
 Size=96
 Context=Applications
@@ -215,3 +243,7 @@
 Size=96
 Context=MimeTypes
 Type=Threshold
+
+[96x96/status]
+Size=96
+Type=Threshold


Index: coverage-tool-links.xml
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/coverage-tool-links.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coverage-tool-links.xml	15 Sep 2006 15:35:31 -0000	1.2
+++ coverage-tool-links.xml	15 Sep 2006 21:29:17 -0000	1.3
@@ -129,10 +129,10 @@
     </icon>
   </context>
   <context dir="filesystems">
-    <icon name="gnome-fs-trash-empty.png">
+    <icon name="gnome-fs-trash-empty">
       <link>../status/user-trash.png</link>
     </icon>
-    <icon name="gnome-fs-trash-full.png">
+    <icon name="gnome-fs-trash-full">
       <link>../status/user-trash-full.png</link>
     </icon>
   </context>


Index: icon-coverage-linker.py
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/icon-coverage-linker.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icon-coverage-linker.py	13 Sep 2006 00:22:17 -0000	1.1
+++ icon-coverage-linker.py	15 Sep 2006 21:29:18 -0000	1.2
@@ -38,11 +38,14 @@
             self.inLink = False
 
 def create_symlinks(base_dir, dirs, gtk_tool_links):
-    for size in dirs:
-        base_size_dir = os.path.join(base_dir, "%ix%i"%(size,size))
-
-        for category in gtk_tool_links.keys():
-	    dir = os.path.join(base_size_dir, category)
+    for category in gtk_tool_links.keys():
+        #make sure we see at least one of each icon listed.
+	#if not it means we have a link to a nonexistent icon
+        icon_ref_count = {}
+        for size in dirs:
+            base_size_dir = os.path.join(base_dir, "%ix%i"%(size,size))
+ 
+            dir = os.path.join(base_size_dir, category)
         
             links = gtk_tool_links[category]
             for (icon, link) in links:
@@ -53,7 +56,13 @@
                 if len(c) > 1:
                     icon = "%s.%s"%(icon, c[-1])
 
-                if os.path.isfile(os.path.join(dir, icon)):
+                if not icon_ref_count.has_key(icon):
+		    icon_ref_count[icon] = 0
+
+                path_to_icon = os.path.join(dir, icon)
+                if os.path.isfile(path_to_icon):
+		    icon_ref_count[icon]+=1
+		    print "file exists " + path_to_icon
                     cur_dir = os.getcwd()
                     full_link_dir = os.path.abspath(os.path.join(dir, link_dir))
                     if not os.path.isdir(full_link_dir):
@@ -72,10 +81,15 @@
                         rel_dir = os.path.join(rel_dir, category, icon) 
                    
                     print "symlinking %s to %s"%(rel_dir, filename)
+                    if os.path.islink(filename):
+		        os.unlink(filename)
+
 		    os.symlink(rel_dir, filename)
-                  
                     os.chdir(cur_dir)
 
+        for icon in icon_ref_count.keys():
+	    if not icon_ref_count[icon] > 0:
+	        raise IOError("Icon '%s' of category '%s' does not exist and can not be linked to"%(icon, category))
 
 def main(argv):
     base_dir = argv[1]


Index: redhat-artwork.spec
===================================================================
RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- redhat-artwork.spec	15 Sep 2006 15:35:31 -0000	1.153
+++ redhat-artwork.spec	15 Sep 2006 21:29:18 -0000	1.154
@@ -4,13 +4,14 @@
 Summary: Artwork for Red Hat default look-and-feel
 Name: redhat-artwork
 Version: 5.0.5
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 Source1: post-install-fixup.sh
 Source2: post-install-sources.tar.gz
 Source3: icon-coverage-linker.py
 Source4: coverage-tool-links.xml
+Patch0: redhat-artwork-5.0.5-add-dirs-to-bluecurve-theme-index.patch
 Group: User Interface/Desktops
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-root
@@ -52,6 +53,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .add-dirs
+
 mkdir post-install
 (cd post-install; tar xzvf %{SOURCE2})
 
@@ -179,6 +182,10 @@
 %config %{_sysconfdir}/gtk-2.0/gtkrc
 
 %changelog
+* Fri Sep 15 2006 John (J5) Palmieri <johnp at redhat.com> - 5.0.5-3
+- Fix up the linking script a bit
+- Patch the index.theme file for Bluecurve so it adds the status directories
+
 * Fri Sep 15 2006 Matthias Clasen <mclasen at redhat.com> - 5.0.5-2
 - Make sure we link both versions of the trash icon

More information about the fedora-cvs-commits mailing list