rpms/fedora-logos/devel .cvsignore, 1.13, 1.14 fedora-logos.spec, 1.14, 1.15 sources, 1.14, 1.15

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/fedora-logos/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19406

Modified Files:
	.cvsignore fedora-logos.spec sources 
Log Message:
- Add new fedora logos to pixmap and icons/hicolor



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	23 May 2005 23:21:14 -0000	1.13
+++ .cvsignore	10 Nov 2005 23:04:48 -0000	1.14
@@ -1 +1,2 @@
 fedora-logos-1.1.31.tar.bz2
+fedora-logos-1.1.32.tar.bz2


Index: fedora-logos.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fedora-logos.spec	8 Sep 2005 18:20:13 -0000	1.14
+++ fedora-logos.spec	10 Nov 2005 23:04:49 -0000	1.15
@@ -1,16 +1,16 @@
 Name: fedora-logos
 Summary: Red Hat-related icons and pictures.
-Version: 1.1.31
-Release: 2
+Version: 1.1.32
+Release: 1
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
 License: Copyright © 1999-2004 Red Hat, Inc.  All rights reserved.
 BuildRoot: %{_tmppath}/%{name}-root
 BuildArchitectures: noarch
 Obsoletes: redhat-logos
-Provides: redhat-logos = %{version}-%{release}
-Provides: system-logos = %{version}-%{release}
-Conflicts: kdebase <= 3.1.5
+Provides: redhat-logos
+Provides: system-logos
+conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 
 %description
@@ -65,10 +65,17 @@
   install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/apps/ksplash/Themes/BlueCurve
 done
 
-#mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-#for i in pixmaps/* ; do
-#  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
-#done
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+for i in pixmaps/* ; do
+  install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/pixmaps
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps
+for size in 16x16 24x24 32x32 36x36 48x48 96x96 ; do
+  for i in icons/hicolor/apps/$size/* ; do
+    install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/$size
+  done
+done
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/Bluecurve
 for i in gdm/* ; do
@@ -100,14 +107,16 @@
 %{_datadir}/apps/kdm/themes/Bluecurve
 %{_datadir}/rhgb
 %{_datadir}/anaconda/pixmaps/*
+%{_datadir}/icons
+
 /usr/lib/anaconda-runtime/boot/*png
 # should be ifarch i386
 /boot/grub/splash.xpm.gz
 # end i386 bits
 
 %changelog
-* Thu Sep 08 2005 Florian La Roche <laroche at redhat.com>
-- add version-release to the Provides:
+* Thu Nov 10 2005 John (J5) Palmieri <johnp at redhat.com> - 1.1.32-1
+- Add new fedora logos to pixmap and icons/hicolor
 
 * Mon May 23 2005 Jeremy Katz <katzj at redhat.com> - 1.1.31-1
 - copyright date on anaconda splash (#153964)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	23 May 2005 23:21:14 -0000	1.14
+++ sources	10 Nov 2005 23:04:49 -0000	1.15
@@ -1 +1 @@
-b27f87eb55c1897fefc62e082e286493  fedora-logos-1.1.31.tar.bz2
+38376278373f4e3b556cc86049ccb079  fedora-logos-1.1.32.tar.bz2