rpms/gnome-backgrounds/devel gnome-backgrounds-paths.patch, NONE, 1.1 gnome-backgrounds.spec, 1.14, 1.15 gnome-backgrounds-2.14.0-paths.patch, 1.2, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-backgrounds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27206

Modified Files:
	gnome-backgrounds.spec 
Added Files:
	gnome-backgrounds-paths.patch 
Removed Files:
	gnome-backgrounds-2.14.0-paths.patch 
Log Message:
update patch


gnome-backgrounds-paths.patch:

--- NEW FILE gnome-backgrounds-paths.patch ---
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  -->
     <_name>Boats Pattern</_name>
-    <filename>@datadir@/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg</filename>
+    <filename>@datadir@/backgrounds/tiles/pattern-boats.svg</filename>
     <options>wallpaper</options>
     <shade_type>vertical-gradient</shade_type>
     <pcolor>#FCAF3E</pcolor>
@@ -15,7 +15,7 @@
     <!-- Translators: This is the name of a desktop background image that shows a clouds pattern.
          You might want to translate it into the equivalent words of your language  -->
     <_name>Clouds Pattern</_name>
-    <filename>@datadir@/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg</filename>
+    <filename>@datadir@/backgrounds/tiles/pattern-clouds.svg</filename>
     <options>wallpaper</options>
     <shade_type>vertical-gradient</shade_type>
     <pcolor>#729FCF</pcolor>
@@ -25,7 +25,7 @@
     <!-- Translators: This is the name of a desktop background image that shows a stars pattern.
          You might want to translate it into the equivalent words of your language  -->
     <_name>Stars Pattern</_name>
-    <filename>@datadir@/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg</filename>
+    <filename>@datadir@/backgrounds/tiles/pattern-stars.svg</filename>
     <options>wallpaper</options>
     <shade_type>vertical-gradient</shade_type>
     <pcolor>#332133</pcolor>
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 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>
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  -->
 		<_name>Fresh Flower</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/FreshFlower.jpg</filename>
+		<filename>@datadir@/backgrounds/nature/FreshFlower.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- Translators: This is the name of a desktop background image that shows a yellow flower.
 		You might want to translate it into the equivalent words of your language  -->
 		<_name>Open Flower</_name>
-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg</filename>
+		<filename>@datadir@/backgrounds/nature/OpenFlower.jpg</filename>
 		<options>zoom</options>
 	</wallpaper>
 	<wallpaper deleted="false">
 		<!-- 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>
+		<filename>@datadir@/backgrounds/nature/GreenMeadow.jpg</filename>
 		<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>


Index: gnome-backgrounds.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnome-backgrounds.spec	10 Mar 2008 04:21:48 -0000	1.14
+++ gnome-backgrounds.spec	10 Mar 2008 04:31:41 -0000	1.15
@@ -14,7 +14,7 @@
 # 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


--- gnome-backgrounds-2.14.0-paths.patch DELETED ---