From d65342ab10b6a041b18e2bf04981de93ee116e12 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 10 Mar 2008 04:31:41 +0000
Subject: [PATCH] update patch

---
 ...ths.patch => gnome-backgrounds-paths.patch | 70 ++++++++++---------
 gnome-backgrounds.spec                        |  2 +-
 2 files changed, 38 insertions(+), 34 deletions(-)
 rename gnome-backgrounds-2.14.0-paths.patch => gnome-backgrounds-paths.patch (76%)

diff --git a/gnome-backgrounds-2.14.0-paths.patch b/gnome-backgrounds-paths.patch
similarity index 76%
rename from gnome-backgrounds-2.14.0-paths.patch
rename to gnome-backgrounds-paths.patch
index 3a80ecd..7e079ea 100644
--- a/gnome-backgrounds-2.14.0-paths.patch
+++ b/gnome-backgrounds-paths.patch
@@ -1,25 +1,6 @@
---- gnome-backgrounds-2.14.0/translucent/gnome-translucent.xml.in.in.paths	2006-03-02 18:17:40.000000000 -0500
-+++ gnome-backgrounds-2.14.0/translucent/gnome-translucent.xml.in.in	2006-03-13 16:06:50.000000000 -0500
-@@ -5,7 +5,7 @@
-     <!-- Translators: This is the name of a desktop background image that shows some ellipses.
-          You might want to translate it into the equivalent words of your language  -->
-     <_name>Ellipses (Translucent)</_name>
--    <filename>@datadir@/pixmaps/backgrounds/gnome/translucent/ellipsis.svg</filename>
-+    <filename>@datadir@/backgrounds/translucent/ellipsis.svg</filename>
-     <options>stretched</options>
-     <shade_type>solid</shade_type>
-     <pcolor>#BABDB6</pcolor>
-@@ -14,7 +14,7 @@
-     <!-- Translators: This is the name of a desktop background image that shows some wavey lines that appear like tentacles.
-          You might want to translate it into the equivalent words of your language  -->
-     <_name>Tentacles (Translucent)</_name>
--    <filename>@datadir@/pixmaps/backgrounds/gnome/translucent/tentacles.svg</filename>
-+    <filename>@datadir@/backgrounds/translucent/tentacles.svg</filename>
-     <options>stretched</options>
-     <shade_type>solid</shade_type>
-     <pcolor>#366B04</pcolor>
---- gnome-backgrounds-2.14.0/tiles/gnome-tiles.xml.in.in.paths	2006-03-11 13:30:33.000000000 -0500
-+++ gnome-backgrounds-2.14.0/tiles/gnome-tiles.xml.in.in	2006-03-13 16:06:50.000000000 -0500
+diff -up gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in.paths gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in
+--- gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in.paths	2007-12-21 20:11:28.000000000 -0500
++++ gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in	2008-03-10 00:27:27.000000000 -0400
 @@ -5,7 +5,7 @@
      <!-- Translators: This is the name of a desktop background image that shows a boats pattern.
           You might want to translate it into the equivalent words of your language  -->
@@ -47,19 +28,30 @@
      <options>wallpaper</options>
      <shade_type>vertical-gradient</shade_type>
      <pcolor>#332133</pcolor>
---- gnome-backgrounds-2.14.0/branded/gnome-branded.xml.in.in.paths	2006-02-13 16:32:19.000000000 -0500
-+++ gnome-backgrounds-2.14.0/branded/gnome-branded.xml.in.in	2006-03-13 16:06:50.000000000 -0500
+diff -up gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in
+--- gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths	2007-12-21 20:11:28.000000000 -0500
++++ gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in	2008-03-10 00:27:27.000000000 -0400
 @@ -5,7 +5,7 @@
-     <!-- Translators: This is the name of a desktop background image that shows the curves of the GNOME logo.
+     <!-- Translators: This is the name of a desktop background image that shows some ellipses.
           You might want to translate it into the equivalent words of your language  -->
-     <_name>GNOME Curves</_name>
--    <filename>@datadir@/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png</filename>
-+    <filename>@datadir@/backgrounds/images/branded/GNOME-Curves.png</filename>
-     <options>zoom</options>
+     <_name>Ellipses (Translucent)</_name>
+-    <filename>@datadir@/pixmaps/backgrounds/gnome/translucent/ellipsis.svg</filename>
++    <filename>@datadir@/backgrounds/translucent/ellipsis.svg</filename>
+     <options>stretched</options>
      <shade_type>solid</shade_type>
-     <pcolor>#76848F</pcolor>
---- gnome-backgrounds-2.14.0/nature/gnome-nature.xml.in.in.paths	2006-03-13 16:19:13.000000000 -0500
-+++ gnome-backgrounds-2.14.0/nature/gnome-nature.xml.in.in	2006-03-13 16:19:32.000000000 -0500
+     <pcolor>#BABDB6</pcolor>
+@@ -14,7 +14,7 @@
+     <!-- Translators: This is the name of a desktop background image that shows some wavey lines that appear like tentacles.
+          You might want to translate it into the equivalent words of your language  -->
+     <_name>Tentacles (Translucent)</_name>
+-    <filename>@datadir@/pixmaps/backgrounds/gnome/translucent/tentacles.svg</filename>
++    <filename>@datadir@/backgrounds/translucent/tentacles.svg</filename>
+     <options>stretched</options>
+     <shade_type>solid</shade_type>
+     <pcolor>#366B04</pcolor>
+diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in
+--- gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths	2007-12-21 20:12:53.000000000 -0500
++++ gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in	2008-03-10 00:29:38.000000000 -0400
 @@ -5,21 +5,21 @@
  	<!-- Translators: This is the name of a desktop background image that shows an orange/red flower.
  		You might want to translate it into the equivalent words of your language  -->
@@ -77,7 +69,7 @@
  		<options>zoom</options>
  	</wallpaper>
  	<wallpaper deleted="false">
- 		<!-- Translators: This is the name of a desktop background image that shows a pebble beach.
+ 		<!-- Translators: This is the name of a desktop background image that shows a green meadow.
  		  You might want to translate it into the equivalent words of your language  -->
  		<_name>Green Meadow</_name>
 -		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/GreenMeadow.jpg</filename>
@@ -85,3 +77,15 @@
  		<options>zoom</options>
  	</wallpaper>
  </wallpapers>
+diff -up gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in
+--- gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths	2007-12-21 20:11:28.000000000 -0500
++++ gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in	2008-03-10 00:27:27.000000000 -0400
+@@ -5,7 +5,7 @@
+     <!-- Translators: This is the name of a desktop background image that shows the curves of the GNOME logo.
+          You might want to translate it into the equivalent words of your language  -->
+     <_name>GNOME Curves</_name>
+-    <filename>@datadir@/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png</filename>
++    <filename>@datadir@/backgrounds/images/branded/GNOME-Curves.png</filename>
+     <options>zoom</options>
+     <shade_type>solid</shade_type>
+     <pcolor>#76848F</pcolor>
diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec
index cb9441d..84b7d72 100644
--- a/gnome-backgrounds.spec
+++ b/gnome-backgrounds.spec
@@ -14,7 +14,7 @@ BuildRequires: perl(XML::Parser)
 # for /usr/share/backgrounds
 Requires: desktop-backgrounds-basic
 
-Patch0: gnome-backgrounds-2.14.0-paths.patch
+Patch0: gnome-backgrounds-paths.patch
 
 %description
 The gnome-backgrounds package contains images and tiles