rpms/generic-logos/devel .cvsignore, 1.6, 1.7 generic-logos.spec, 1.6, 1.7 sources, 1.6, 1.7

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/generic-logos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24041/devel

Modified Files:
	.cvsignore generic-logos.spec sources 
Log Message:
* Sun Oct 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 10.0.0-2
- Add (current version of) KDE logo for SolarComet KSplash theme


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Oct 2008 21:08:15 -0000	1.6
+++ .cvsignore	26 Oct 2008 02:23:18 -0000	1.7
@@ -1 +1,2 @@
 generic-logos-10.0.0.tar.bz2
+SolarComet-kde.png


Index: generic-logos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/devel/generic-logos.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- generic-logos.spec	23 Oct 2008 21:08:15 -0000	1.6
+++ generic-logos.spec	26 Oct 2008 02:23:18 -0000	1.7
@@ -1,9 +1,10 @@
 Name: generic-logos
 Summary: Icons and pictures
 Version: 10.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Source0: generic-logos-%{version}.tar.bz2
+Source1: SolarComet-kde.png
 License: GPLv2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -14,6 +15,8 @@
 Conflicts: kdebase <= 3.1.5
 Conflicts: anaconda-images <= 10
 Conflicts: redhat-artwork <= 5.0.5
+# For _kde4_appsdir macro:
+BuildRequires: kde-filesystem
 
 %description
 The generic-logos package contains various image files which can be
@@ -52,21 +55,41 @@
 
 (cd anaconda; make DESTDIR=$RPM_BUILD_ROOT install)
 
+# KDE logo for KDE splash screen
+cat >COPYING-kde-logo <<EOF
+From http://wiki.kde.org/tiki-index.php?page=KDE+Logo:
+Trademark License
+Copying of the KDE Logo is subject to the LGPL copyright license.
+Trading and branding with the KDE Logo is subject to our trademark licence:
+1. The KDE logo can be used freely as long as it is not used to refer to
+   products other than KDE itself.
+2. There is no formal procedure for using the KDE logo as long as you stay
+   within the above guideline for usage.
+3. Whilst not required you should acknowledge the KDE e.V.s rights by mentioning
+   "KDE, K Desktop Environment and the KDE Logo are trademarks of KDE e.V."
+EOF
+mkdir -p $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root)
-%doc COPYING
+%doc COPYING COPYING-kde-logo
 %{_datadir}/firstboot/*
 %{_datadir}/anaconda/pixmaps/*
 %{_datadir}/pixmaps/*
+%{_kde4_appsdir}/ksplash/Themes/SolarComet/1280x1024/logo.png
 /usr/lib/anaconda-runtime/*.jpg
 # should be ifarch i386
 /boot/grub/splash.xpm.gz
 # end i386 bits
 
 %changelog
+* Sun Oct 26 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 10.0.0-2
+- Add (current version of) KDE logo for SolarComet KSplash theme
+
 * Thu Oct 23 2008 Bill Nottingham <notting at redhat.com> - 10.0.0-1
 - update for current fedora-logos, with Solar theme
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/generic-logos/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Oct 2008 21:08:15 -0000	1.6
+++ sources	26 Oct 2008 02:23:18 -0000	1.7
@@ -1 +1,2 @@
 b2fbf4c891cd7f95a2162989c19a2cc2  generic-logos-10.0.0.tar.bz2
+8649fa005f3c00be6bb83b0e6222a923  SolarComet-kde.png