rpms/gnome-icon-theme/devel .cvsignore, 1.23, 1.24 gnome-icon-theme.spec, 1.35, 1.36 sources, 1.23, 1.24

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-icon-theme/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16447

Modified Files:
	.cvsignore gnome-icon-theme.spec sources 
Log Message:
Add missing icons



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	7 Feb 2006 04:21:40 -0000	1.23
+++ .cvsignore	7 Feb 2006 18:52:17 -0000	1.24
@@ -14,3 +14,5 @@
 gnome-icon-theme-2.13.5.tar.bz2
 gnome-icon-theme-2.13.5.1.tar.bz2
 gnome-icon-theme-2.13.7.tar.bz2
+external-icons-2.13.90-1.tar.gz
+external-icons-2.13.7.tar.gz


Index: gnome-icon-theme.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gnome-icon-theme.spec	7 Feb 2006 04:21:40 -0000	1.35
+++ gnome-icon-theme.spec	7 Feb 2006 18:52:17 -0000	1.36
@@ -1,9 +1,9 @@
 Summary: Base gnome icons
 Name: gnome-icon-theme
 Version: 2.13.7
-Release: 1
+Release: 2
 Source0: %{name}-%{version}.tar.bz2
-Source1: external-icons-2.10.1-2.tar.gz
+Source1: external-icons-2.13.7.tar.gz
 License: GPL
 BuildArch: noarch
 Group: User Interface/Desktops
@@ -37,40 +37,25 @@
 ## remove these bogus files
 rm -rf $RPM_BUILD_ROOT/usr/share/locale/*
 
-## create symlinks so the gnome theme covers some extra icons we've added
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-
-ln -s gnome-util.png redhat-accessories.png
-#ln -s %{_datadir}/pixmaps/.png redhat-extras.png
-ln -s gnome-joystick.png redhat-games.png
-ln -s gnome-graphics.png redhat-graphics.png
+for i in 48x48 24x24; do 
+## create symlinks so the all icon themes know some extra icons we've added
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$i/apps
+
+ln -s ../../../gnome/$i/apps/gnome-util.png redhat-accessories.png
+ln -s ../../../gnome/$i/apps/gnome-joystick.png redhat-games.png
+ln -s ../../../gnome/$i/apps/gnome-graphics.png redhat-graphics.png
 ln -s ../../../../pixmaps/gnome-home.png redhat-home.png
-ln -s gnome-globe.png redhat-internet.png
-ln -s gnome-desktop-config.png redhat-preferences.png
-ln -s gnome-applications.png redhat-office.png
-ln -s gnome-devel.png redhat-programming.png
-ln -s gnome-server-config.png redhat-server_settings.png
-ln -s gnome-multimedia.png redhat-sound_video.png
-ln -s gnome-starthere.png redhat-starthere.png
-ln -s gnome-system-config.png redhat-system_settings.png
-ln -s gnome-system.png redhat-system_tools.png
-#ln -s %{_datadir}/pixmaps/.png redhat-tools.png
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems
-
-rm -f gnome-fs-locally-shared.png
-rm -f gnome-fs-share-private.png
-ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png
-ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems
-cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems
-
-rm -f gnome-fs-locally-shared.png rm -f gnome-fs-share-private.png
-ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png
-ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png
+ln -s ../../../gnome/$i/apps/gnome-globe.png redhat-internet.png
+ln -s ../../../gnome/$i/apps/gnome-desktop-config.png redhat-preferences.png
+ln -s ../../../gnome/$i/apps/gnome-applications.png redhat-office.png
+ln -s ../../../gnome/$i/apps/gnome-devel.png redhat-programming.png
+ln -s ../../../gnome/$i/apps/gnome-server-config.png redhat-server_settings.png
+ln -s ../../../gnome/$i/apps/gnome-multimedia.png redhat-sound_video.png
+ln -s ../../../gnome/$i/apps/gnome-starthere.png redhat-starthere.png
+ln -s ../../../gnome/$i/apps/gnome-system-config.png redhat-system_settings.png
+ln -s ../../../gnome/$i/apps/gnome-system.png redhat-system_tools.png
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,6 +76,10 @@
 %{_datadir}/pkgconfig/gnome-icon-theme.pc
 
 %changelog
+* Tue Feb  7 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-2
+- Add back some icons that went missing
+- Fix redhat- symlinks that were broken since FC1
+
 * Mon Feb  6 2006 Matthias Clasen <mclasen at redhat.com> 2.13.7-1
 - Update to 2.13.7
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	7 Feb 2006 04:21:40 -0000	1.23
+++ sources	7 Feb 2006 18:52:17 -0000	1.24
@@ -1,2 +1,2 @@
-e6c3328995f2ce73ee91d1a654198f3f  external-icons-2.10.1-2.tar.gz
 65c461966868c09cd189aa144a0ab8b3  gnome-icon-theme-2.13.7.tar.bz2
+8374adf91a28e2f56888672f74d80a52  external-icons-2.13.7.tar.gz