From 050d25b0619937582c63b7f1fc7926537552fa2c Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Apr 28 2008 03:12:06 +0000
Subject: - use bg image without rounded corners for kde-splash (Pavel Shevchuk,

    #443308)

---

diff --git a/.cvsignore b/.cvsignore
index 26f61c1..77a9abc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 fedora-logos-9.0.0.tar.bz2
+background.png
diff --git a/fedora-logos-8.99.2-ksplash_FedoraWaves.patch b/fedora-logos-8.99.2-ksplash_FedoraWaves.patch
deleted file mode 100644
index d4924ea..0000000
--- a/fedora-logos-8.99.2-ksplash_FedoraWaves.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -up fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt.FedoraWaves fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt
---- fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt.FedoraWaves	2008-04-02 10:13:27.000000000 -0500
-+++ fedora-logos-8.99.2/kde-splash/FedoraWaves/1600x1200/description.txt	2008-04-09 13:55:07.000000000 -0500
-@@ -2,19 +2,19 @@ SCALE OFF
- GEOMETRY_REL CC 0 0 CC 490 278
- IMAGE 0 0 background.png
- 
--WAIT_STATE kded
- ANIM 1 193 215 11 kded.png 25 1
-+WAIT_STATE kded
- 
--WAIT_STATE confupdate
- ANIM 2 218 215 11 confupdate.png 25 1
-+WAIT_STATE confupdate
- 
--WAIT_STATE kcminit
- ANIM 3 243 215 11 kcminit.png 25 1
-+WAIT_STATE kcminit
- 
-+ANIM 4 268 215 11 ksmserver.png 25 1
- WAIT_STATE ksmserver
--ANIM 3 268 215 11 ksmserver.png 25 1
- 
-+ANIM 5 293 215 11 wm.png 25 1
- WAIT_STATE wm
--ANIM 3 293 215 11 wm.png 25 1
- 
--WAIT_STATE desktop
-\ No newline at end of file
-+WAIT_STATE desktop
-diff -up fedora-logos-8.99.2/Makefile.FedoraWaves fedora-logos-8.99.2/Makefile
---- fedora-logos-8.99.2/Makefile.FedoraWaves	2008-04-02 10:13:27.000000000 -0500
-+++ fedora-logos-8.99.2/Makefile	2008-04-10 08:41:13.000000000 -0500
-@@ -22,7 +22,7 @@ archive: 
- 	mkdir -p $$DISTDIR/firstboot ; \
- 	mkdir -p $$DISTDIR/rhgb ; \
- 	mkdir -p $$DISTDIR/gnome-splash ; \
--	mkdir -p $$DISTDIR/kde-splash/Waves/1600x1200 ; \
-+	mkdir -p $$DISTDIR/kde-splash/FedoraWaves/1600x1200 ; \
- 	mkdir -p $$DISTDIR/pixmaps ; \
- 	mkdir -p $$DISTDIR/gdm ; \
- 	mkdir -p $$DISTDIR/anaconda ; \
-@@ -44,8 +44,8 @@ archive: 
- 	cp -f $$SRCDIR/firstboot/*.png firstboot ; \
- 	cp -f $$SRCDIR/rhgb/*.png rhgb ; \
- 	cp -f $$SRCDIR/gnome-splash/*.png gnome-splash ; \
--	cp -f $$SRCDIR/kde-splash/Waves/* kde-splash/Waves/ ; \
--	cp -f $$SRCDIR/kde-splash/Waves/1600x1200/* kde-splash/Waves/1600x1200; \
-+	cp -f $$SRCDIR/kde-splash/FedoraWaves/* kde-splash/FedoraWaves/ ; \
-+	cp -f $$SRCDIR/kde-splash/FedoraWaves/1600x1200/* kde-splash/FedoraWaves/1600x1200; \
- 	cp -f $$SRCDIR/pixmaps/*.{png,svg} pixmaps ; \
- 	cp -af $$SRCDIR/gdm/* gdm; \
- 	cp -f $$SRCDIR/anaconda/* anaconda ; \
diff --git a/fedora-logos.spec b/fedora-logos.spec
index 17f3c9e..3f4ca90 100644
--- a/fedora-logos.spec
+++ b/fedora-logos.spec
@@ -1,9 +1,11 @@
 Name: fedora-logos
 Summary: Fedora-related icons and pictures
 Version: 9.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 Source0: fedora-logos-%{version}.tar.bz2
+# fixed KDE splash screen background
+Source1: background.png
 
 # The trademarks contained in this file are the property of Red Hat, Inc.  No
 # license to these trademarks is provided or is necessary if you merely
@@ -34,6 +36,7 @@ redistribution.
 
 %prep
 %setup -q
+cp -pf %{SOURCE1} kde-splash/FedoraWaves/1600x1200/background.png
 
 %build
 
@@ -177,6 +180,9 @@ fi
 # end i386 bits
 
 %changelog
+* Mon Apr 28 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 9.0.0-2
+- use bg image without rounded corners for kde-splash (Pavel Shevchuk, #443308)
+
 * Fri Apr 11 2008 Ray Strode <rstrode@redhat.com> - 9.0.0-1
 - update grub splash screen to not have sulfur and look better
   on EFI systems
diff --git a/sources b/sources
index 2fe797e..ef904a7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 aa04bc8b779fdca2104ab056188309cb  fedora-logos-9.0.0.tar.bz2
+81e40a58d6177308e07d5db33e8e655b  background.png