rpms/generic-logos/F-12 .cvsignore, 1.10, 1.11 generic-logos.spec, 1.13, 1.14 sources, 1.11, 1.12

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/generic-logos/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12218/F-12

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
update to 12.1, add generic anaconda.png


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	1 Oct 2009 18:06:42 -0000	1.10
+++ .cvsignore	30 Oct 2009 18:01:55 -0000	1.11
@@ -1 +1 @@
-generic-logos-12.0.tar.bz2
+generic-logos-12.1.tar.bz2


Index: generic-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/F-12/generic-logos.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- generic-logos.spec	1 Oct 2009 18:06:42 -0000	1.13
+++ generic-logos.spec	30 Oct 2009 18:01:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name: generic-logos
 Summary: Icons and pictures
-Version: 12.0
+Version: 12.1
 Release: 1%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
@@ -61,6 +61,12 @@ for i in plymouth/charge/* ; do
     install -p -m 644 $i $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/charge/
 done
 
+# File or directory names do not count as trademark infringement
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+install -p -m 644 icons/Fedora/48x48/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/48x48/apps/
+install	-p -m 644 icons/Fedora/scalable/apps/* $RPM_BUILD_ROOT%{_datadir}/icons/Fedora/scalable/apps/
+
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
 %clean
@@ -71,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING COPYING-kde-logo
 %{_datadir}/firstboot/themes/*
 %{_datadir}/anaconda/pixmaps/*
+%{_datadir}/icons/Fedora/*/apps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/plymouth/themes/charge/*
 /usr/lib/anaconda-runtime/*.jpg
@@ -80,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 # end i386 bits
 
 %changelog
+* Fri Oct 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12.1-1
+- 12.1 (add generic versions of anaconda.png/svg)
+
 * Thu Oct  1 2009 Bill Nottingham <notting at redhat.com> - 12.0-1
 - update for F12 (<duffy at redhat.com>)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	1 Oct 2009 18:06:42 -0000	1.11
+++ sources	30 Oct 2009 18:01:55 -0000	1.12
@@ -1 +1 @@
-6fd16c93945a0e195fe1f03ddf3d06a7  generic-logos-12.0.tar.bz2
+247d09a2a9d738dc24fc3c1cb1b489d4  generic-logos-12.1.tar.bz2