From b52527fb598a321195fd05d3afbb98f506495d5e Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@fedoraproject.org>
Date: Sep 30 2004 16:00:01 +0000
Subject: - New default background infrastructure.


---

diff --git a/Makefile b/Makefile
index a9cf096..fa1d203 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,14 @@
 # Makefile for source rpm: desktop-backgrounds
-# $Id$
+# $Id: Makefile,v 1.1 2004/09/09 04:07:00 cvsdist Exp $
 NAME := desktop-backgrounds
 SPECFILE = $(firstword $(wildcard *.spec))
 
+TARGETS = generate-default-background
+
+.PHONY :: generate-default-background
+
+generate-default-background:
+	cp default-background-fc.png default-background.png
+	if echo $(COLLECTION) | grep -q -e "^dist-[^-]*E\($$\|-\)"; then cp default-background-rhel.png default-background.png; fi
+
 include ../common/Makefile.common
diff --git a/default-background-fc.png b/default-background-fc.png
new file mode 100644
index 0000000..e6f5d39
Binary files /dev/null and b/default-background-fc.png differ
diff --git a/default-background-rhel.png b/default-background-rhel.png
new file mode 100644
index 0000000..faab61e
Binary files /dev/null and b/default-background-rhel.png differ
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index aa7e1a2..83c8b63 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -3,14 +3,14 @@
 Summary: Desktop backgrounds.
 Name: desktop-backgrounds
 Version: 2.0
-Release: 25
+Release: 26
 License: LGPL
 Group: Applications/Multimedia
 Source: redhat-backgrounds-%{rh_backgrounds_version}.tar.bz2
 Source2: Propaganda-1.0.0.tar.gz
 Source3: README.Propaganda
 ## Source4: beta-placeholder.png
-Source4: default.png
+Source4: default-background.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArchitectures: noarch
 
@@ -103,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_datadir}/backgrounds/images/default.png
 
 %changelog
+* Thu Sep 30 2004 Alexander Larsson <alexl@redhat.com> - 2.0-26
+- New default background infrastructure.
+
 * Mon Sep 27 2004 Matthias Clasen <mclasen@@redhat.com> 2.0.25
 - avoid duplicate images