rpms/gnome-color-manager/F-13 .cvsignore, 1.8, 1.9 gnome-color-manager.spec, 1.12, 1.13 sources, 1.8, 1.9

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/gnome-color-manager/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23399

Modified Files:
	.cvsignore gnome-color-manager.spec sources 
Log Message:
* Wed Apr 21 2010 Richard Hughes <richard at hughsie.com> 2.30.0-6
- Use the new application icon designed by Hylke Bons.
- Resolves: 584446



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	29 Mar 2010 10:18:03 -0000	1.8
+++ .cvsignore	21 Apr 2010 16:14:21 -0000	1.9
@@ -1 +1 @@
-gnome-color-manager-2.30.0.tar.gz
+21Apr2010-gnome-color-manager_icons.tar.bz2


Index: gnome-color-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/gnome-color-manager.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- gnome-color-manager.spec	7 Apr 2010 07:32:26 -0000	1.12
+++ gnome-color-manager.spec	21 Apr 2010 16:14:21 -0000	1.13
@@ -1,12 +1,15 @@
 Summary:   Color management tools for GNOME
 Name:      gnome-color-manager
 Version:   2.30.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 License:   GPLv2+
 URL:       http://projects.gnome.org/gnome-color-manager/
 Source0:   http://download.gnome.org/sources/gnome-color-manager/2.30/%{name}-%{version}.tar.gz
 
 # Already upstream
+Source1:   21Apr2010-gnome-color-manager_icons.tar.bz2
+
+# Already upstream
 Patch0:    gnome-color-manager-2.31.1-do-not-explode-for-non-rgb-profiles.patch
 
 Requires:  gnome-icon-theme
@@ -47,6 +50,14 @@ and generate color profiles in the GNOME
 %setup -q
 %patch0 -p1 -b .no-explode
 
+# use new F14 icons
+tar xvfj %{SOURCE1}
+cp gnome-color-manager/16x16/apps/*.png data/icons/16x16
+cp gnome-color-manager/22x22/apps/*.png data/icons/22x22
+cp gnome-color-manager/24x24/apps/*.png data/icons/24x24
+cp gnome-color-manager/48x48/apps/*.png data/icons/48x48
+cp gnome-color-manager/scalable/apps/*.svg data/icons/scalable
+
 %build
 %configure --disable-scrollkeeper --disable-schemas-install
 make %{?_smp_mflags}
@@ -113,6 +124,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %dir %{_localstatedir}/lib/color
 
 %changelog
+* Wed Apr 21 2010 Richard Hughes <richard at hughsie.com> 2.30.0-6
+- Use the new application icon designed by Hylke Bons.
+- Resolves: 584446
+
 * Wed Apr 07 2010 Richard Hughes <richard at hughsie.com> 2.30.0-5
 - Do not segfault when viewing non-RGB profile graphs
 - Resolves: 579820


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-color-manager/F-13/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	29 Mar 2010 10:18:03 -0000	1.8
+++ sources	21 Apr 2010 16:14:21 -0000	1.9
@@ -1 +1 @@
-a46b61d7b2837c99c9c612ceb00bdb23  gnome-color-manager-2.30.0.tar.gz
+d54c904bc88614e7a1a1ee5caef59449  21Apr2010-gnome-color-manager_icons.tar.bz2