rpms/gnome-backgrounds/devel .cvsignore, 1.10, 1.11 gnome-backgrounds-paths.patch, 1.1, 1.2 gnome-backgrounds.spec, 1.15, 1.16 sources, 1.10, 1.11

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Tue Jul 22 22:48:44 UTC 2008 

Author: mclasen

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

Modified Files:
	.cvsignore gnome-backgrounds-paths.patch 
	gnome-backgrounds.spec sources 
Log Message:
2.23.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	10 Mar 2008 04:21:48 -0000	1.10
+++ .cvsignore	22 Jul 2008 22:47:55 -0000	1.11
@@ -1 +1 @@
-gnome-backgrounds-2.22.0.tar.bz2
+gnome-backgrounds-2.23.0.tar.bz2

gnome-backgrounds-paths.patch:

Index: gnome-backgrounds-paths.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/gnome-backgrounds-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-backgrounds-paths.patch	10 Mar 2008 04:31:41 -0000	1.1
+++ gnome-backgrounds-paths.patch	22 Jul 2008 22:47:55 -0000	1.2
@@ -1,58 +1,43 @@
-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 @@
+diff -up gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in.paths gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in
+--- gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in.paths	2008-07-22 18:45:51.000000000 -0400
++++ gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in	2008-07-22 18:46:25.000000000 -0400
+@@ -3,27 +3,27 @@
+ <wallpapers>
+ 	<wallpaper deleted="false">
+ 		<_name>Flow</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Flow.png</filename>
++		<filename>@datadir@/backgrounds/abstract/Flow.png</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Gulp</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Gulp.png</filename>
++		<filename>@datadir@/backgrounds/abstract/Gulp.png</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Silk</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Silk.png</filename>
++		<filename>@datadir@/backgrounds/abstract/Silk.png</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Spring</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Spring.png</filename>
++		<filename>@datadir@/backgrounds/abstract/Spring.png</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Waves</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Waves.png</filename>
++		<filename>@datadir@/backgrounds/abstract/Waves.png</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ </wallpapers>
+diff -up gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in.paths gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in
+--- gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in.paths	2008-07-22 11:46:06.000000000 -0400
++++ gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in	2008-07-22 18:44:10.000000000 -0400
+@@ -5,64 +5,64 @@
  	<!-- 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>
@@ -61,14 +46,6 @@
  		<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>
@@ -76,16 +53,64 @@
 +		<filename>@datadir@/backgrounds/nature/GreenMeadow.jpg</filename>
  		<options>zoom</options>
  	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Aqua</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Aqua.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Aqua.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Dune</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Dune.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Storm</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Dune.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Two Wings</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/TwoWings.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/TwoWings.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Lady Bird</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/LadyBird.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/LadyBird.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Blinds</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Blinds.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Blinds.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Rain Drops</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/RainDrops.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/RainDrops.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Yellow Flower</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/YellowFlower.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Garden</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Garden.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Garden.jpg</filename>
+ 		<options>zoom</options>
+ 	</wallpaper>
+ 	<wallpaper deleted="false">
+ 		<_name>Wood</_name>
+-		<filename>@datadir@/pixmaps/backgrounds/gnome/nature/Wood.jpg</filename>
++		<filename>@datadir@/backgrounds/nature/Wood.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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnome-backgrounds.spec	10 Mar 2008 04:31:41 -0000	1.15
+++ gnome-backgrounds.spec	22 Jul 2008 22:47:55 -0000	1.16
@@ -1,11 +1,11 @@
 Summary: Desktop backgrounds packaged with the GNOME desktop
 Name: gnome-backgrounds
-Version: 2.22.0
+Version: 2.23.0
 Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-backgrounds/2.22/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-backgrounds/2.23/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -35,9 +35,7 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
 
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/branded $RPM_BUILD_ROOT%{_datadir}/backgrounds/images
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/tiles $RPM_BUILD_ROOT%{_datadir}/backgrounds
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/translucent $RPM_BUILD_ROOT%{_datadir}/backgrounds
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/abstract $RPM_BUILD_ROOT%{_datadir}/backgrounds
 mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/nature $RPM_BUILD_ROOT%{_datadir}/backgrounds
 
 %find_lang %{name}
@@ -52,6 +50,9 @@
 %{_datadir}/backgrounds/*
 
 %changelog
+* Tue Jul 22 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.0-1
+- Update to 2.23.0
+
 * Mon Mar 10 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
 - Update to 2.22.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-backgrounds/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	10 Mar 2008 04:21:48 -0000	1.10
+++ sources	22 Jul 2008 22:47:55 -0000	1.11
@@ -1 +1 @@
-1997e020288ea6b91ed460c2c6bfc8d4  gnome-backgrounds-2.22.0.tar.bz2
+ab83065de900abe6f8388070892fa8d5  gnome-backgrounds-2.23.0.tar.bz2

More information about the fedora-extras-commits mailing list