diff --git a/.cvsignore b/.cvsignore index 5bdbd43..351ece6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gnome-backgrounds-2.22.0.tar.bz2 +gnome-backgrounds-2.23.0.tar.bz2 diff --git a/gnome-backgrounds-paths.patch b/gnome-backgrounds-paths.patch index 7e079ea..c373962 100644 --- a/gnome-backgrounds-paths.patch +++ b/gnome-backgrounds-paths.patch @@ -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 @@ - - <_name>Boats Pattern -- @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-boats.svg -+ @datadir@/backgrounds/tiles/pattern-boats.svg - wallpaper - vertical-gradient - #FCAF3E -@@ -15,7 +15,7 @@ - - <_name>Clouds Pattern -- @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-clouds.svg -+ @datadir@/backgrounds/tiles/pattern-clouds.svg - wallpaper - vertical-gradient - #729FCF -@@ -25,7 +25,7 @@ - - <_name>Stars Pattern -- @datadir@/pixmaps/backgrounds/gnome/tiles/pattern-stars.svg -+ @datadir@/backgrounds/tiles/pattern-stars.svg - wallpaper - vertical-gradient - #332133 -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 @@ - - <_name>Ellipses (Translucent) -- @datadir@/pixmaps/backgrounds/gnome/translucent/ellipsis.svg -+ @datadir@/backgrounds/translucent/ellipsis.svg - stretched - solid - #BABDB6 -@@ -14,7 +14,7 @@ - - <_name>Tentacles (Translucent) -- @datadir@/pixmaps/backgrounds/gnome/translucent/tentacles.svg -+ @datadir@/backgrounds/translucent/tentacles.svg - stretched - solid - #366B04 -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 @@ + + + <_name>Flow +- @datadir@/pixmaps/backgrounds/gnome/abstract/Flow.png ++ @datadir@/backgrounds/abstract/Flow.png + zoom + + + <_name>Gulp +- @datadir@/pixmaps/backgrounds/gnome/abstract/Gulp.png ++ @datadir@/backgrounds/abstract/Gulp.png + zoom + + + <_name>Silk +- @datadir@/pixmaps/backgrounds/gnome/abstract/Silk.png ++ @datadir@/backgrounds/abstract/Silk.png + zoom + + + <_name>Spring +- @datadir@/pixmaps/backgrounds/gnome/abstract/Spring.png ++ @datadir@/backgrounds/abstract/Spring.png + zoom + + + <_name>Waves +- @datadir@/pixmaps/backgrounds/gnome/abstract/Waves.png ++ @datadir@/backgrounds/abstract/Waves.png + zoom + + +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 @@ <_name>Fresh Flower @@ -61,14 +46,6 @@ diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-back zoom - - <_name>Open Flower -- @datadir@/pixmaps/backgrounds/gnome/nature/OpenFlower.jpg -+ @datadir@/backgrounds/nature/OpenFlower.jpg - zoom - - <_name>Green Meadow @@ -76,16 +53,64 @@ diff -up gnome-backgrounds-2.22.0/nature/gnome-nature.xml.in.in.paths gnome-back + @datadir@/backgrounds/nature/GreenMeadow.jpg zoom + + <_name>Aqua +- @datadir@/pixmaps/backgrounds/gnome/nature/Aqua.jpg ++ @datadir@/backgrounds/nature/Aqua.jpg + zoom + + + <_name>Dune +- @datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg ++ @datadir@/backgrounds/nature/Dune.jpg + zoom + + + <_name>Storm +- @datadir@/pixmaps/backgrounds/gnome/nature/Dune.jpg ++ @datadir@/backgrounds/nature/Dune.jpg + zoom + + + <_name>Two Wings +- @datadir@/pixmaps/backgrounds/gnome/nature/TwoWings.jpg ++ @datadir@/backgrounds/nature/TwoWings.jpg + zoom + + + <_name>Lady Bird +- @datadir@/pixmaps/backgrounds/gnome/nature/LadyBird.jpg ++ @datadir@/backgrounds/nature/LadyBird.jpg + zoom + + + <_name>Blinds +- @datadir@/pixmaps/backgrounds/gnome/nature/Blinds.jpg ++ @datadir@/backgrounds/nature/Blinds.jpg + zoom + + + <_name>Rain Drops +- @datadir@/pixmaps/backgrounds/gnome/nature/RainDrops.jpg ++ @datadir@/backgrounds/nature/RainDrops.jpg + zoom + + + <_name>Yellow Flower +- @datadir@/pixmaps/backgrounds/gnome/nature/YellowFlower.jpg ++ @datadir@/backgrounds/nature/YellowFlower.jpg + zoom + + + <_name>Garden +- @datadir@/pixmaps/backgrounds/gnome/nature/Garden.jpg ++ @datadir@/backgrounds/nature/Garden.jpg + zoom + + + <_name>Wood +- @datadir@/pixmaps/backgrounds/gnome/nature/Wood.jpg ++ @datadir@/backgrounds/nature/Wood.jpg + zoom + -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 @@ - - <_name>GNOME Curves -- @datadir@/pixmaps/backgrounds/gnome/branded/GNOME-Curves.png -+ @datadir@/backgrounds/images/branded/GNOME-Curves.png - zoom - solid - #76848F diff --git a/gnome-backgrounds.spec b/gnome-backgrounds.spec index 84b7d72..b484616 100644 --- a/gnome-backgrounds.spec +++ b/gnome-backgrounds.spec @@ -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 @@ make install DESTDIR=$RPM_BUILD_ROOT 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 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/backgrounds/* %changelog +* Tue Jul 22 2008 Matthias Clasen - 2.23.0-1 +- Update to 2.23.0 + * Mon Mar 10 2008 Matthias Clasen - 2.22.0-1 - Update to 2.22.0 diff --git a/sources b/sources index 05e1e02..e5a2e24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1997e020288ea6b91ed460c2c6bfc8d4 gnome-backgrounds-2.22.0.tar.bz2 +ab83065de900abe6f8388070892fa8d5 gnome-backgrounds-2.23.0.tar.bz2