This commit is contained in:
Matthias Clasen 2008-07-22 22:47:55 +00:00
parent d65342ab10
commit 009dfc873b
4 changed files with 108 additions and 82 deletions

View File

@ -1 +1 @@
gnome-backgrounds-2.22.0.tar.bz2 gnome-backgrounds-2.23.0.tar.bz2

View File

@ -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 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.22.0/tiles/gnome-tiles.xml.in.in.paths 2007-12-21 20:11:28.000000000 -0500 --- gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in.paths 2008-07-22 18:45:51.000000000 -0400
+++ gnome-backgrounds-2.22.0/tiles/gnome-tiles.xml.in.in 2008-03-10 00:27:27.000000000 -0400 +++ gnome-backgrounds-2.23.0/abstract/gnome-abstract.xml.in.in 2008-07-22 18:46:25.000000000 -0400
@@ -5,7 +5,7 @@ @@ -3,27 +3,27 @@
<!-- Translators: This is the name of a desktop background image that shows a boats pattern. <wallpapers>
You might want to translate it into the equivalent words of your language --> <wallpaper deleted="false">
<_name>Boats Pattern</_name> <_name>Flow</_name>
- <filename>@datadir@/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg</filename> - <filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Flow.png</filename>
+ <filename>@datadir@/backgrounds/tiles/pattern-boats.svg</filename> + <filename>@datadir@/backgrounds/abstract/Flow.png</filename>
<options>wallpaper</options> <options>zoom</options>
<shade_type>vertical-gradient</shade_type> </wallpaper>
<pcolor>#FCAF3E</pcolor> <wallpaper deleted="false">
@@ -15,7 +15,7 @@ <_name>Gulp</_name>
<!-- Translators: This is the name of a desktop background image that shows a clouds pattern. - <filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Gulp.png</filename>
You might want to translate it into the equivalent words of your language --> + <filename>@datadir@/backgrounds/abstract/Gulp.png</filename>
<_name>Clouds Pattern</_name> <options>zoom</options>
- <filename>@datadir@/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg</filename> </wallpaper>
+ <filename>@datadir@/backgrounds/tiles/pattern-clouds.svg</filename> <wallpaper deleted="false">
<options>wallpaper</options> <_name>Silk</_name>
<shade_type>vertical-gradient</shade_type> - <filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Silk.png</filename>
<pcolor>#729FCF</pcolor> + <filename>@datadir@/backgrounds/abstract/Silk.png</filename>
@@ -25,7 +25,7 @@ <options>zoom</options>
<!-- Translators: This is the name of a desktop background image that shows a stars pattern. </wallpaper>
You might want to translate it into the equivalent words of your language --> <wallpaper deleted="false">
<_name>Stars Pattern</_name> <_name>Spring</_name>
- <filename>@datadir@/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg</filename> - <filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Spring.png</filename>
+ <filename>@datadir@/backgrounds/tiles/pattern-stars.svg</filename> + <filename>@datadir@/backgrounds/abstract/Spring.png</filename>
<options>wallpaper</options> <options>zoom</options>
<shade_type>vertical-gradient</shade_type> </wallpaper>
<pcolor>#332133</pcolor> <wallpaper deleted="false">
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 <_name>Waves</_name>
--- gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in.paths 2007-12-21 20:11:28.000000000 -0500 - <filename>@datadir@/pixmaps/backgrounds/gnome/abstract/Waves.png</filename>
+++ gnome-backgrounds-2.22.0/translucent/gnome-translucent.xml.in.in 2008-03-10 00:27:27.000000000 -0400 + <filename>@datadir@/backgrounds/abstract/Waves.png</filename>
@@ -5,7 +5,7 @@ <options>zoom</options>
<!-- Translators: This is the name of a desktop background image that shows some ellipses. </wallpaper>
You might want to translate it into the equivalent words of your language --> </wallpapers>
<_name>Ellipses (Translucent)</_name> 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
- <filename>@datadir@/pixmaps/backgrounds/gnome/translucent/ellipsis.svg</filename> --- gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in.paths 2008-07-22 11:46:06.000000000 -0400
+ <filename>@datadir@/backgrounds/translucent/ellipsis.svg</filename> +++ gnome-backgrounds-2.23.0/nature/gnome-nature.xml.in.in 2008-07-22 18:44:10.000000000 -0400
<options>stretched</options> @@ -5,64 +5,64 @@
<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. <!-- 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 --> You might want to translate it into the equivalent words of your language -->
<_name>Fresh Flower</_name> <_name>Fresh Flower</_name>
@ -60,14 +45,6 @@ diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-back
+ <filename>@datadir@/backgrounds/nature/FreshFlower.jpg</filename> + <filename>@datadir@/backgrounds/nature/FreshFlower.jpg</filename>
<options>zoom</options> <options>zoom</options>
</wallpaper> </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"> <wallpaper deleted="false">
<!-- Translators: This is the name of a desktop background image that shows a green meadow. <!-- 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 --> You might want to translate it into the equivalent words of your language -->
@ -76,16 +53,64 @@ diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-back
+ <filename>@datadir@/backgrounds/nature/GreenMeadow.jpg</filename> + <filename>@datadir@/backgrounds/nature/GreenMeadow.jpg</filename>
<options>zoom</options> <options>zoom</options>
</wallpaper> </wallpaper>
</wallpapers> <wallpaper deleted="false">
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 <_name>Aqua</_name>
--- gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in.paths 2007-12-21 20:11:28.000000000 -0500 - <filename>@datadir@/pixmaps/backgrounds/gnome/nature/Aqua.jpg</filename>
+++ gnome-backgrounds-2.22.0/branded/gnome-branded.xml.in.in 2008-03-10 00:27:27.000000000 -0400 + <filename>@datadir@/backgrounds/nature/Aqua.jpg</filename>
@@ -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> <options>zoom</options>
<shade_type>solid</shade_type> </wallpaper>
<pcolor>#76848F</pcolor> <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>

View File

@ -1,11 +1,11 @@
Summary: Desktop backgrounds packaged with the GNOME desktop Summary: Desktop backgrounds packaged with the GNOME desktop
Name: gnome-backgrounds Name: gnome-backgrounds
Version: 2.22.0 Version: 2.23.0
Release: 1%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.gnome.org 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch BuildArch: noarch
BuildRequires: gettext BuildRequires: gettext
@ -35,9 +35,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images 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/abstract $RPM_BUILD_ROOT%{_datadir}/backgrounds
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/nature $RPM_BUILD_ROOT%{_datadir}/backgrounds mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/backgrounds/gnome/nature $RPM_BUILD_ROOT%{_datadir}/backgrounds
%find_lang %{name} %find_lang %{name}
@ -52,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/backgrounds/* %{_datadir}/backgrounds/*
%changelog %changelog
* Tue Jul 22 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.0-1
- Update to 2.23.0
* Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1 * Mon Mar 10 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.0-1
- Update to 2.22.0 - Update to 2.22.0

View File

@ -1 +1 @@
1997e020288ea6b91ed460c2c6bfc8d4 gnome-backgrounds-2.22.0.tar.bz2 ab83065de900abe6f8388070892fa8d5 gnome-backgrounds-2.23.0.tar.bz2