From f0dd96c1c05e8f9dbb5790dde903e16593e4e7f8c17d9c5981b48bfb0f771277 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 25 Nov 2009 11:04:22 +0000
Subject: [PATCH 1/7] Accepting request 24396 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-desktop via accept of submit request 24396 revision 43.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/24396
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=60
---
 gnome-desktop-2.28.0.tar.bz2                  |  3 --
 gnome-desktop-2.28.1.tar.bz2                  |  3 ++
 ...e-desktop-fate300461-desktop-gettext.patch | 38 +++++++++----------
 gnome-desktop-recently-used-apps.patch        | 17 +++++----
 gnome-desktop.changes                         |  8 ++++
 gnome-desktop.spec                            |  4 +-
 6 files changed, 41 insertions(+), 32 deletions(-)
 delete mode 100644 gnome-desktop-2.28.0.tar.bz2
 create mode 100644 gnome-desktop-2.28.1.tar.bz2

diff --git a/gnome-desktop-2.28.0.tar.bz2 b/gnome-desktop-2.28.0.tar.bz2
deleted file mode 100644
index a05e299..0000000
--- a/gnome-desktop-2.28.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5
-size 3244945
diff --git a/gnome-desktop-2.28.1.tar.bz2 b/gnome-desktop-2.28.1.tar.bz2
new file mode 100644
index 0000000..893744c
--- /dev/null
+++ b/gnome-desktop-2.28.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21bb7d3b4aa9b452ecf1b27d6fe61b824f60f76d7c5f3b78b59f0fd3eedfd461
+size 1639948
diff --git a/gnome-desktop-fate300461-desktop-gettext.patch b/gnome-desktop-fate300461-desktop-gettext.patch
index e037ef2..a364ab7 100644
--- a/gnome-desktop-fate300461-desktop-gettext.patch
+++ b/gnome-desktop-fate300461-desktop-gettext.patch
@@ -1,8 +1,8 @@
 Index: libgnome-desktop/gnome-desktop-item.c
 ===================================================================
---- libgnome-desktop/gnome-desktop-item.c	(révision 5293)
-+++ libgnome-desktop/gnome-desktop-item.c	(copie de travail)
-@@ -81,6 +81,7 @@ struct _GnomeDesktopItem {
+--- libgnome-desktop/gnome-desktop-item.c.orig
++++ libgnome-desktop/gnome-desktop-item.c
+@@ -85,6 +85,7 @@ struct _GnomeDesktopItem {
  	GHashTable *main_hash;
  
  	char *location;
@@ -10,16 +10,16 @@ Index: libgnome-desktop/gnome-desktop-item.c
  
  	time_t mtime;
  
-@@ -134,6 +135,8 @@ static GnomeDesktopItem *gnome_desktop_i
- 							    GnomeDesktopItemLoadFlags flags,
- 							    GError **error);
+@@ -140,6 +141,8 @@ static GnomeDesktopItem *gnome_desktop_i
+ 
+ static void update_recently_used_apps (const GnomeDesktopItem *item);
  
 +static const char *lookup (const GnomeDesktopItem *item, const char *key);
 +
  static int
  readbuf_getc (ReadBuf *rb)
  {
-@@ -394,6 +397,7 @@ gnome_desktop_item_new (void)
+@@ -387,6 +390,7 @@ gnome_desktop_item_new (void)
  				       "1.0");
  
  	retval->launch_time = 0;
@@ -27,7 +27,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  
  	return retval;
  }
-@@ -472,6 +476,10 @@ gnome_desktop_item_copy (const GnomeDesk
+@@ -465,6 +469,10 @@ gnome_desktop_item_copy (const GnomeDesk
  			      copy_string_hash,
  			      retval->main_hash);
  
@@ -38,7 +38,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  	return retval;
  }
  
-@@ -923,6 +931,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
+@@ -916,6 +924,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
  	g_free (item->location);
  	item->location = NULL;
  
@@ -48,7 +48,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  	g_free (item);
  }
  
-@@ -1011,6 +1022,71 @@ lookup_locale (const GnomeDesktopItem *i
+@@ -1004,6 +1015,71 @@ lookup_locale (const GnomeDesktopItem *i
  }
  
  static const char *
@@ -120,7 +120,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  lookup_best_locale (const GnomeDesktopItem *item, const char *key)
  {
  	const char * const *langs_pointer;
-@@ -1020,6 +1096,14 @@ lookup_best_locale (const GnomeDesktopIt
+@@ -1013,6 +1089,14 @@ lookup_best_locale (const GnomeDesktopIt
  	for (i = 0; langs_pointer[i] != NULL; i++) {
  		const char *ret = NULL;
  
@@ -135,7 +135,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		ret = lookup_locale (item, key, langs_pointer[i]);
  		if (ret != NULL)
  			return ret;
-@@ -2946,11 +3030,21 @@ gnome_desktop_item_get_localestring_lang
+@@ -2720,11 +2804,21 @@ gnome_desktop_item_get_localestring_lang
  					  const char *attr,
  					  const char *language)
  {
@@ -158,7 +158,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  }
  
  /**
-@@ -2978,6 +3072,14 @@ gnome_desktop_item_get_attr_locale (cons
+@@ -2752,6 +2846,14 @@ gnome_desktop_item_get_attr_locale (cons
  	for (i = 0; langs_pointer[i] != NULL; i++) {
  		const char *value = NULL;
  
@@ -173,7 +173,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		value = lookup_locale (item, attr, langs_pointer[i]);
  		if (value)
  			return langs_pointer[i];
-@@ -2998,6 +3100,9 @@ gnome_desktop_item_get_languages (const
+@@ -2772,6 +2874,9 @@ gnome_desktop_item_get_languages (const
  
  	for (li = item->languages; li != NULL; li = li->next) {
  		char *language = li->data;
@@ -183,7 +183,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		if (attr == NULL ||
  		    lookup_locale (item, attr, language) != NULL) {
  			list = g_list_prepend (list, language);
-@@ -3715,6 +3820,8 @@ try_english_key (GnomeDesktopItem *item,
+@@ -3489,6 +3594,8 @@ try_english_key (GnomeDesktopItem *item,
  
  	str = NULL;
  	for (i = 0; locales[i] != NULL && str == NULL; i++) {
@@ -192,7 +192,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		str = g_strdup (lookup_locale (item, key, locales[i]));
  	}
  	if (str != NULL) {
-@@ -3983,6 +4090,10 @@ ditem_load (ReadBuf *rb,
+@@ -3757,6 +3864,10 @@ ditem_load (ReadBuf *rb,
  
  	readbuf_close (rb);
  
@@ -208,10 +208,10 @@ Index: libgnome-desktop/libgnome/gnome-desktop-item.h
 --- libgnome-desktop/libgnome/gnome-desktop-item.h.orig
 +++ libgnome-desktop/libgnome/gnome-desktop-item.h
 @@ -97,6 +97,7 @@ typedef struct _GnomeDesktopItem GnomeDe
- #define GNOME_DESKTOP_ITEM_DOC_PATH    "X-GNOME-DocPath" /* string */
+ #define GNOME_DESKTOP_ITEM_DOC_PATH	"X-GNOME-DocPath" /* string */
  #define GNOME_DESKTOP_ITEM_SUBSTITUTEUID "X-KDE-SubstituteUID" /*boolean*/
  #define GNOME_DESKTOP_ITEM_ROOT_ONLY     "X-KDE-RootOnly" /*boolean*/
 +#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" /* string */
  /* The vfolder proposal */
- #define GNOME_DESKTOP_ITEM_CATEGORIES  "Categories" /* string */
- #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN        "OnlyShowIn" /* string */
+ #define GNOME_DESKTOP_ITEM_CATEGORIES	"Categories" /* string */
+ #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN	"OnlyShowIn" /* string */
diff --git a/gnome-desktop-recently-used-apps.patch b/gnome-desktop-recently-used-apps.patch
index 8e790fa..1214437 100644
--- a/gnome-desktop-recently-used-apps.patch
+++ b/gnome-desktop-recently-used-apps.patch
@@ -1,7 +1,8 @@
-diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c
---- gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c	2008-04-21 12:09:49.695084000 +0200
-+++ gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c	2008-04-21 12:24:25.530379000 +0200
-@@ -55,6 +55,8 @@
+Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
+===================================================================
+--- gnome-desktop-2.28.1.orig/libgnome-desktop/gnome-desktop-item.c
++++ gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
+@@ -52,6 +52,8 @@
  #include <gtk/gtk.h>
  #endif
  
@@ -9,8 +10,8 @@ diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-des
 +
  #define sure_string(s) ((s)!=NULL?(s):"")
  
- #undef GNOME_DISABLE_DEPRECATED
-@@ -135,6 +137,8 @@ static GnomeDesktopItem *gnome_desktop_i
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+@@ -136,6 +138,8 @@ static GnomeDesktopItem *gnome_desktop_i
  							    GnomeDesktopItemLoadFlags flags,
  							    GError **error);
  
@@ -19,7 +20,7 @@ diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-des
  static int
  readbuf_getc (ReadBuf *rb)
  {
-@@ -2116,6 +2120,8 @@ gnome_desktop_item_launch_on_screen_with
+@@ -2111,6 +2115,8 @@ gnome_desktop_item_launch_on_screen_with
  			     (flags & GNOME_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD),
  			     error);
  
@@ -28,7 +29,7 @@ diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-des
  	return ret;
  }
  
-@@ -4155,3 +4161,39 @@ gnome_desktop_item_error_quark (void)
+@@ -3873,3 +3879,39 @@ gnome_desktop_item_error_quark (void)
  
  	return q;
  }
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index 7b2a631..c97826f 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Nov 14 21:12:37 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.28.1:
+  + Updated translations.
+- Respin gnome-desktop-fate300461-desktop-gettext.patch and
+  gnome-desktop-recently-used-apps.patch to apply without fuzz.
+
 -------------------------------------------------------------------
 Tue Sep 22 13:53:10 CEST 2009 - dimstar@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index e769373..4fcacb4 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-desktop (Version 2.28.0)
+# spec file for package gnome-desktop (Version 2.28.1)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           gnome-desktop
-Version:        2.28.0
+Version:        2.28.1
 Release:        1
 License:        GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
 Summary:        The GNOME Desktop API Library

From b126cd2b5c56ed43133e4d5b00143a584568e75c5210465e9cbd5ac457dcf1fa Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 3 Dec 2009 01:51:12 +0000
Subject: [PATCH 2/7] Accepting request 25369 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-desktop via accept of submit request 25369 revision 2.
Request was accepted with message:
Accepting...

OBS-URL: https://build.opensuse.org/request/show/25369
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=61
---
 gnome-desktop-2.28.1.tar.bz2 |  3 ---
 gnome-desktop-2.29.3.tar.bz2 |  3 +++
 gnome-desktop.changes        | 12 ++++++++++++
 gnome-desktop.spec           |  8 ++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)
 delete mode 100644 gnome-desktop-2.28.1.tar.bz2
 create mode 100644 gnome-desktop-2.29.3.tar.bz2

diff --git a/gnome-desktop-2.28.1.tar.bz2 b/gnome-desktop-2.28.1.tar.bz2
deleted file mode 100644
index 893744c..0000000
--- a/gnome-desktop-2.28.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:21bb7d3b4aa9b452ecf1b27d6fe61b824f60f76d7c5f3b78b59f0fd3eedfd461
-size 1639948
diff --git a/gnome-desktop-2.29.3.tar.bz2 b/gnome-desktop-2.29.3.tar.bz2
new file mode 100644
index 0000000..0a192a6
--- /dev/null
+++ b/gnome-desktop-2.29.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5149b966a95b3d9fada30c9f08b23a8a955b06bf5b88730e74378bb347eb482c
+size 1615623
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index c97826f..daa309d 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Dec  2 11:33:44 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.29.3:
+  + Build improvement
+- Changes from version 2.29.2:
+  + GnomeRR:
+    - Allow rotation if the virtual size has the correct number of
+      pixels
+    - Add gamma API
+  + Updated translations.
+
 -------------------------------------------------------------------
 Sat Nov 14 21:12:37 CET 2009 - vuntz@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 4fcacb4..79f3789 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-desktop (Version 2.28.1)
+# spec file for package gnome-desktop (Version 2.29.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,8 @@
 
 
 Name:           gnome-desktop
-Version:        2.28.1
+Version:        2.29.3
+# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory
 Release:        1
 License:        GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
 Summary:        The GNOME Desktop API Library
@@ -105,6 +106,9 @@ make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
+# %if 0%{?suse_version} <= 1120
+%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+# %endif
 %find_lang %{name}-2.0
 %find_lang fdl %{name}-2.0.lang
 %find_lang gpl %{name}-2.0.lang

From 66a97060f185aae871761b107f1b52b9becc5458860a24429409fdd3efdeead3 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Mon, 7 Dec 2009 13:37:41 +0000
Subject: [PATCH 3/7] en@shaw

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=62
---
 gnome-desktop.spec | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 79f3789..817788f 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -19,7 +19,6 @@
 
 Name:           gnome-desktop
 Version:        2.29.3
-# FIXME: en@shaw is always removed; fix it when new filesystem package is accepted in factory
 Release:        1
 License:        GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
 Summary:        The GNOME Desktop API Library
@@ -106,9 +105,9 @@ make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
-# %if 0%{?suse_version} <= 1120
+%if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-# %endif
+%endif
 %find_lang %{name}-2.0
 %find_lang fdl %{name}-2.0.lang
 %find_lang gpl %{name}-2.0.lang

From 1e96d91fc8054c28323d5c0e00c1bb22123e4ba6faabd8a8fc756ec9c06f2366 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 8 Dec 2009 09:34:40 +0000
Subject: [PATCH 4/7] checked in

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=63
---
 gnome-desktop-2.28.0.tar.bz2                  |  3 ++
 gnome-desktop-2.29.3.tar.bz2                  |  3 --
 ...e-desktop-fate300461-desktop-gettext.patch | 38 +++++++++----------
 gnome-desktop-recently-used-apps.patch        | 17 ++++-----
 gnome-desktop.changes                         | 20 ----------
 gnome-desktop.spec                            |  7 +---
 6 files changed, 32 insertions(+), 56 deletions(-)
 create mode 100644 gnome-desktop-2.28.0.tar.bz2
 delete mode 100644 gnome-desktop-2.29.3.tar.bz2

diff --git a/gnome-desktop-2.28.0.tar.bz2 b/gnome-desktop-2.28.0.tar.bz2
new file mode 100644
index 0000000..a05e299
--- /dev/null
+++ b/gnome-desktop-2.28.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5
+size 3244945
diff --git a/gnome-desktop-2.29.3.tar.bz2 b/gnome-desktop-2.29.3.tar.bz2
deleted file mode 100644
index 0a192a6..0000000
--- a/gnome-desktop-2.29.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5149b966a95b3d9fada30c9f08b23a8a955b06bf5b88730e74378bb347eb482c
-size 1615623
diff --git a/gnome-desktop-fate300461-desktop-gettext.patch b/gnome-desktop-fate300461-desktop-gettext.patch
index a364ab7..e037ef2 100644
--- a/gnome-desktop-fate300461-desktop-gettext.patch
+++ b/gnome-desktop-fate300461-desktop-gettext.patch
@@ -1,8 +1,8 @@
 Index: libgnome-desktop/gnome-desktop-item.c
 ===================================================================
---- libgnome-desktop/gnome-desktop-item.c.orig
-+++ libgnome-desktop/gnome-desktop-item.c
-@@ -85,6 +85,7 @@ struct _GnomeDesktopItem {
+--- libgnome-desktop/gnome-desktop-item.c	(révision 5293)
++++ libgnome-desktop/gnome-desktop-item.c	(copie de travail)
+@@ -81,6 +81,7 @@ struct _GnomeDesktopItem {
  	GHashTable *main_hash;
  
  	char *location;
@@ -10,16 +10,16 @@ Index: libgnome-desktop/gnome-desktop-item.c
  
  	time_t mtime;
  
-@@ -140,6 +141,8 @@ static GnomeDesktopItem *gnome_desktop_i
- 
- static void update_recently_used_apps (const GnomeDesktopItem *item);
+@@ -134,6 +135,8 @@ static GnomeDesktopItem *gnome_desktop_i
+ 							    GnomeDesktopItemLoadFlags flags,
+ 							    GError **error);
  
 +static const char *lookup (const GnomeDesktopItem *item, const char *key);
 +
  static int
  readbuf_getc (ReadBuf *rb)
  {
-@@ -387,6 +390,7 @@ gnome_desktop_item_new (void)
+@@ -394,6 +397,7 @@ gnome_desktop_item_new (void)
  				       "1.0");
  
  	retval->launch_time = 0;
@@ -27,7 +27,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  
  	return retval;
  }
-@@ -465,6 +469,10 @@ gnome_desktop_item_copy (const GnomeDesk
+@@ -472,6 +476,10 @@ gnome_desktop_item_copy (const GnomeDesk
  			      copy_string_hash,
  			      retval->main_hash);
  
@@ -38,7 +38,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  	return retval;
  }
  
-@@ -916,6 +924,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
+@@ -923,6 +931,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
  	g_free (item->location);
  	item->location = NULL;
  
@@ -48,7 +48,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  	g_free (item);
  }
  
-@@ -1004,6 +1015,71 @@ lookup_locale (const GnomeDesktopItem *i
+@@ -1011,6 +1022,71 @@ lookup_locale (const GnomeDesktopItem *i
  }
  
  static const char *
@@ -120,7 +120,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  lookup_best_locale (const GnomeDesktopItem *item, const char *key)
  {
  	const char * const *langs_pointer;
-@@ -1013,6 +1089,14 @@ lookup_best_locale (const GnomeDesktopIt
+@@ -1020,6 +1096,14 @@ lookup_best_locale (const GnomeDesktopIt
  	for (i = 0; langs_pointer[i] != NULL; i++) {
  		const char *ret = NULL;
  
@@ -135,7 +135,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		ret = lookup_locale (item, key, langs_pointer[i]);
  		if (ret != NULL)
  			return ret;
-@@ -2720,11 +2804,21 @@ gnome_desktop_item_get_localestring_lang
+@@ -2946,11 +3030,21 @@ gnome_desktop_item_get_localestring_lang
  					  const char *attr,
  					  const char *language)
  {
@@ -158,7 +158,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  }
  
  /**
-@@ -2752,6 +2846,14 @@ gnome_desktop_item_get_attr_locale (cons
+@@ -2978,6 +3072,14 @@ gnome_desktop_item_get_attr_locale (cons
  	for (i = 0; langs_pointer[i] != NULL; i++) {
  		const char *value = NULL;
  
@@ -173,7 +173,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		value = lookup_locale (item, attr, langs_pointer[i]);
  		if (value)
  			return langs_pointer[i];
-@@ -2772,6 +2874,9 @@ gnome_desktop_item_get_languages (const
+@@ -2998,6 +3100,9 @@ gnome_desktop_item_get_languages (const
  
  	for (li = item->languages; li != NULL; li = li->next) {
  		char *language = li->data;
@@ -183,7 +183,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		if (attr == NULL ||
  		    lookup_locale (item, attr, language) != NULL) {
  			list = g_list_prepend (list, language);
-@@ -3489,6 +3594,8 @@ try_english_key (GnomeDesktopItem *item,
+@@ -3715,6 +3820,8 @@ try_english_key (GnomeDesktopItem *item,
  
  	str = NULL;
  	for (i = 0; locales[i] != NULL && str == NULL; i++) {
@@ -192,7 +192,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		str = g_strdup (lookup_locale (item, key, locales[i]));
  	}
  	if (str != NULL) {
-@@ -3757,6 +3864,10 @@ ditem_load (ReadBuf *rb,
+@@ -3983,6 +4090,10 @@ ditem_load (ReadBuf *rb,
  
  	readbuf_close (rb);
  
@@ -208,10 +208,10 @@ Index: libgnome-desktop/libgnome/gnome-desktop-item.h
 --- libgnome-desktop/libgnome/gnome-desktop-item.h.orig
 +++ libgnome-desktop/libgnome/gnome-desktop-item.h
 @@ -97,6 +97,7 @@ typedef struct _GnomeDesktopItem GnomeDe
- #define GNOME_DESKTOP_ITEM_DOC_PATH	"X-GNOME-DocPath" /* string */
+ #define GNOME_DESKTOP_ITEM_DOC_PATH    "X-GNOME-DocPath" /* string */
  #define GNOME_DESKTOP_ITEM_SUBSTITUTEUID "X-KDE-SubstituteUID" /*boolean*/
  #define GNOME_DESKTOP_ITEM_ROOT_ONLY     "X-KDE-RootOnly" /*boolean*/
 +#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" /* string */
  /* The vfolder proposal */
- #define GNOME_DESKTOP_ITEM_CATEGORIES	"Categories" /* string */
- #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN	"OnlyShowIn" /* string */
+ #define GNOME_DESKTOP_ITEM_CATEGORIES  "Categories" /* string */
+ #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN        "OnlyShowIn" /* string */
diff --git a/gnome-desktop-recently-used-apps.patch b/gnome-desktop-recently-used-apps.patch
index 1214437..8e790fa 100644
--- a/gnome-desktop-recently-used-apps.patch
+++ b/gnome-desktop-recently-used-apps.patch
@@ -1,8 +1,7 @@
-Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
-===================================================================
---- gnome-desktop-2.28.1.orig/libgnome-desktop/gnome-desktop-item.c
-+++ gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
-@@ -52,6 +52,8 @@
+diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c
+--- gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c	2008-04-21 12:09:49.695084000 +0200
++++ gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c	2008-04-21 12:24:25.530379000 +0200
+@@ -55,6 +55,8 @@
  #include <gtk/gtk.h>
  #endif
  
@@ -10,8 +9,8 @@ Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
 +
  #define sure_string(s) ((s)!=NULL?(s):"")
  
- #define GNOME_DESKTOP_USE_UNSTABLE_API
-@@ -136,6 +138,8 @@ static GnomeDesktopItem *gnome_desktop_i
+ #undef GNOME_DISABLE_DEPRECATED
+@@ -135,6 +137,8 @@ static GnomeDesktopItem *gnome_desktop_i
  							    GnomeDesktopItemLoadFlags flags,
  							    GError **error);
  
@@ -20,7 +19,7 @@ Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
  static int
  readbuf_getc (ReadBuf *rb)
  {
-@@ -2111,6 +2115,8 @@ gnome_desktop_item_launch_on_screen_with
+@@ -2116,6 +2120,8 @@ gnome_desktop_item_launch_on_screen_with
  			     (flags & GNOME_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD),
  			     error);
  
@@ -29,7 +28,7 @@ Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
  	return ret;
  }
  
-@@ -3873,3 +3879,39 @@ gnome_desktop_item_error_quark (void)
+@@ -4155,3 +4161,39 @@ gnome_desktop_item_error_quark (void)
  
  	return q;
  }
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index daa309d..7b2a631 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,23 +1,3 @@
--------------------------------------------------------------------
-Wed Dec  2 11:33:44 CET 2009 - vuntz@opensuse.org
-
-- Update to version 2.29.3:
-  + Build improvement
-- Changes from version 2.29.2:
-  + GnomeRR:
-    - Allow rotation if the virtual size has the correct number of
-      pixels
-    - Add gamma API
-  + Updated translations.
-
--------------------------------------------------------------------
-Sat Nov 14 21:12:37 CET 2009 - vuntz@opensuse.org
-
-- Update to version 2.28.1:
-  + Updated translations.
-- Respin gnome-desktop-fate300461-desktop-gettext.patch and
-  gnome-desktop-recently-used-apps.patch to apply without fuzz.
-
 -------------------------------------------------------------------
 Tue Sep 22 13:53:10 CEST 2009 - dimstar@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 817788f..e769373 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-desktop (Version 2.29.3)
+# spec file for package gnome-desktop (Version 2.28.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           gnome-desktop
-Version:        2.29.3
+Version:        2.28.0
 Release:        1
 License:        GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
 Summary:        The GNOME Desktop API Library
@@ -105,9 +105,6 @@ make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
-%if 0%{?suse_version} <= 1120
-%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
-%endif
 %find_lang %{name}-2.0
 %find_lang fdl %{name}-2.0.lang
 %find_lang gpl %{name}-2.0.lang

From c370e0285ac12c98af4f4dbe14b9d30366838afdcc7dd20738a3b1a10a5173f9 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 24 Dec 2009 15:30:16 +0000
Subject: [PATCH 5/7] Accepting request 27488 from
 home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/gnome-desktop via accept of submit request 27488 revision 2.
Request was accepted with message:
accept

OBS-URL: https://build.opensuse.org/request/show/27488
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=64
---
 gnome-desktop-2.28.0.tar.bz2                  |  3 --
 gnome-desktop-2.29.4.tar.bz2                  |  3 ++
 ...e-desktop-fate300461-desktop-gettext.patch | 38 +++++++++----------
 gnome-desktop-recently-used-apps.patch        | 17 +++++----
 gnome-desktop.changes                         | 29 ++++++++++++++
 gnome-desktop.spec                            | 13 ++++---
 6 files changed, 68 insertions(+), 35 deletions(-)
 delete mode 100644 gnome-desktop-2.28.0.tar.bz2
 create mode 100644 gnome-desktop-2.29.4.tar.bz2

diff --git a/gnome-desktop-2.28.0.tar.bz2 b/gnome-desktop-2.28.0.tar.bz2
deleted file mode 100644
index a05e299..0000000
--- a/gnome-desktop-2.28.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5
-size 3244945
diff --git a/gnome-desktop-2.29.4.tar.bz2 b/gnome-desktop-2.29.4.tar.bz2
new file mode 100644
index 0000000..9267eea
--- /dev/null
+++ b/gnome-desktop-2.29.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25e016d9ac169bf96f2c0b9ee2d44e91c889861969c0d58c5c77ec288d012963
+size 1616707
diff --git a/gnome-desktop-fate300461-desktop-gettext.patch b/gnome-desktop-fate300461-desktop-gettext.patch
index e037ef2..a364ab7 100644
--- a/gnome-desktop-fate300461-desktop-gettext.patch
+++ b/gnome-desktop-fate300461-desktop-gettext.patch
@@ -1,8 +1,8 @@
 Index: libgnome-desktop/gnome-desktop-item.c
 ===================================================================
---- libgnome-desktop/gnome-desktop-item.c	(révision 5293)
-+++ libgnome-desktop/gnome-desktop-item.c	(copie de travail)
-@@ -81,6 +81,7 @@ struct _GnomeDesktopItem {
+--- libgnome-desktop/gnome-desktop-item.c.orig
++++ libgnome-desktop/gnome-desktop-item.c
+@@ -85,6 +85,7 @@ struct _GnomeDesktopItem {
  	GHashTable *main_hash;
  
  	char *location;
@@ -10,16 +10,16 @@ Index: libgnome-desktop/gnome-desktop-item.c
  
  	time_t mtime;
  
-@@ -134,6 +135,8 @@ static GnomeDesktopItem *gnome_desktop_i
- 							    GnomeDesktopItemLoadFlags flags,
- 							    GError **error);
+@@ -140,6 +141,8 @@ static GnomeDesktopItem *gnome_desktop_i
+ 
+ static void update_recently_used_apps (const GnomeDesktopItem *item);
  
 +static const char *lookup (const GnomeDesktopItem *item, const char *key);
 +
  static int
  readbuf_getc (ReadBuf *rb)
  {
-@@ -394,6 +397,7 @@ gnome_desktop_item_new (void)
+@@ -387,6 +390,7 @@ gnome_desktop_item_new (void)
  				       "1.0");
  
  	retval->launch_time = 0;
@@ -27,7 +27,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  
  	return retval;
  }
-@@ -472,6 +476,10 @@ gnome_desktop_item_copy (const GnomeDesk
+@@ -465,6 +469,10 @@ gnome_desktop_item_copy (const GnomeDesk
  			      copy_string_hash,
  			      retval->main_hash);
  
@@ -38,7 +38,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  	return retval;
  }
  
-@@ -923,6 +931,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
+@@ -916,6 +924,9 @@ gnome_desktop_item_unref (GnomeDesktopIt
  	g_free (item->location);
  	item->location = NULL;
  
@@ -48,7 +48,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  	g_free (item);
  }
  
-@@ -1011,6 +1022,71 @@ lookup_locale (const GnomeDesktopItem *i
+@@ -1004,6 +1015,71 @@ lookup_locale (const GnomeDesktopItem *i
  }
  
  static const char *
@@ -120,7 +120,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  lookup_best_locale (const GnomeDesktopItem *item, const char *key)
  {
  	const char * const *langs_pointer;
-@@ -1020,6 +1096,14 @@ lookup_best_locale (const GnomeDesktopIt
+@@ -1013,6 +1089,14 @@ lookup_best_locale (const GnomeDesktopIt
  	for (i = 0; langs_pointer[i] != NULL; i++) {
  		const char *ret = NULL;
  
@@ -135,7 +135,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		ret = lookup_locale (item, key, langs_pointer[i]);
  		if (ret != NULL)
  			return ret;
-@@ -2946,11 +3030,21 @@ gnome_desktop_item_get_localestring_lang
+@@ -2720,11 +2804,21 @@ gnome_desktop_item_get_localestring_lang
  					  const char *attr,
  					  const char *language)
  {
@@ -158,7 +158,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  }
  
  /**
-@@ -2978,6 +3072,14 @@ gnome_desktop_item_get_attr_locale (cons
+@@ -2752,6 +2846,14 @@ gnome_desktop_item_get_attr_locale (cons
  	for (i = 0; langs_pointer[i] != NULL; i++) {
  		const char *value = NULL;
  
@@ -173,7 +173,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		value = lookup_locale (item, attr, langs_pointer[i]);
  		if (value)
  			return langs_pointer[i];
-@@ -2998,6 +3100,9 @@ gnome_desktop_item_get_languages (const
+@@ -2772,6 +2874,9 @@ gnome_desktop_item_get_languages (const
  
  	for (li = item->languages; li != NULL; li = li->next) {
  		char *language = li->data;
@@ -183,7 +183,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		if (attr == NULL ||
  		    lookup_locale (item, attr, language) != NULL) {
  			list = g_list_prepend (list, language);
-@@ -3715,6 +3820,8 @@ try_english_key (GnomeDesktopItem *item,
+@@ -3489,6 +3594,8 @@ try_english_key (GnomeDesktopItem *item,
  
  	str = NULL;
  	for (i = 0; locales[i] != NULL && str == NULL; i++) {
@@ -192,7 +192,7 @@ Index: libgnome-desktop/gnome-desktop-item.c
  		str = g_strdup (lookup_locale (item, key, locales[i]));
  	}
  	if (str != NULL) {
-@@ -3983,6 +4090,10 @@ ditem_load (ReadBuf *rb,
+@@ -3757,6 +3864,10 @@ ditem_load (ReadBuf *rb,
  
  	readbuf_close (rb);
  
@@ -208,10 +208,10 @@ Index: libgnome-desktop/libgnome/gnome-desktop-item.h
 --- libgnome-desktop/libgnome/gnome-desktop-item.h.orig
 +++ libgnome-desktop/libgnome/gnome-desktop-item.h
 @@ -97,6 +97,7 @@ typedef struct _GnomeDesktopItem GnomeDe
- #define GNOME_DESKTOP_ITEM_DOC_PATH    "X-GNOME-DocPath" /* string */
+ #define GNOME_DESKTOP_ITEM_DOC_PATH	"X-GNOME-DocPath" /* string */
  #define GNOME_DESKTOP_ITEM_SUBSTITUTEUID "X-KDE-SubstituteUID" /*boolean*/
  #define GNOME_DESKTOP_ITEM_ROOT_ONLY     "X-KDE-RootOnly" /*boolean*/
 +#define GNOME_DESKTOP_ITEM_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" /* string */
  /* The vfolder proposal */
- #define GNOME_DESKTOP_ITEM_CATEGORIES  "Categories" /* string */
- #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN        "OnlyShowIn" /* string */
+ #define GNOME_DESKTOP_ITEM_CATEGORIES	"Categories" /* string */
+ #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN	"OnlyShowIn" /* string */
diff --git a/gnome-desktop-recently-used-apps.patch b/gnome-desktop-recently-used-apps.patch
index 8e790fa..1214437 100644
--- a/gnome-desktop-recently-used-apps.patch
+++ b/gnome-desktop-recently-used-apps.patch
@@ -1,7 +1,8 @@
-diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c
---- gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c	2008-04-21 12:09:49.695084000 +0200
-+++ gnome-desktop-2.22.1-patched/libgnome-desktop/gnome-desktop-item.c	2008-04-21 12:24:25.530379000 +0200
-@@ -55,6 +55,8 @@
+Index: gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
+===================================================================
+--- gnome-desktop-2.28.1.orig/libgnome-desktop/gnome-desktop-item.c
++++ gnome-desktop-2.28.1/libgnome-desktop/gnome-desktop-item.c
+@@ -52,6 +52,8 @@
  #include <gtk/gtk.h>
  #endif
  
@@ -9,8 +10,8 @@ diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-des
 +
  #define sure_string(s) ((s)!=NULL?(s):"")
  
- #undef GNOME_DISABLE_DEPRECATED
-@@ -135,6 +137,8 @@ static GnomeDesktopItem *gnome_desktop_i
+ #define GNOME_DESKTOP_USE_UNSTABLE_API
+@@ -136,6 +138,8 @@ static GnomeDesktopItem *gnome_desktop_i
  							    GnomeDesktopItemLoadFlags flags,
  							    GError **error);
  
@@ -19,7 +20,7 @@ diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-des
  static int
  readbuf_getc (ReadBuf *rb)
  {
-@@ -2116,6 +2120,8 @@ gnome_desktop_item_launch_on_screen_with
+@@ -2111,6 +2115,8 @@ gnome_desktop_item_launch_on_screen_with
  			     (flags & GNOME_DESKTOP_ITEM_LAUNCH_DO_NOT_REAP_CHILD),
  			     error);
  
@@ -28,7 +29,7 @@ diff -Naurp gnome-desktop-2.22.1/libgnome-desktop/gnome-desktop-item.c gnome-des
  	return ret;
  }
  
-@@ -4155,3 +4161,39 @@ gnome_desktop_item_error_quark (void)
+@@ -3873,3 +3879,39 @@ gnome_desktop_item_error_quark (void)
  
  	return q;
  }
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index 7b2a631..bdc1e75 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Dec 23 10:22:42 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.29.4:
+  + GnomeBG:
+    - Per-monitor background support
+    - Memory leak fixes
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Dec  2 11:33:44 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.29.3:
+  + Build improvement
+- Changes from version 2.29.2:
+  + GnomeRR:
+    - Allow rotation if the virtual size has the correct number of
+      pixels
+    - Add gamma API
+  + Updated translations.
+
+-------------------------------------------------------------------
+Sat Nov 14 21:12:37 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.28.1:
+  + Updated translations.
+- Respin gnome-desktop-fate300461-desktop-gettext.patch and
+  gnome-desktop-recently-used-apps.patch to apply without fuzz.
+
 -------------------------------------------------------------------
 Tue Sep 22 13:53:10 CEST 2009 - dimstar@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index e769373..678afa0 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-desktop (Version 2.28.0)
+# spec file for package gnome-desktop (Version 2.29.4)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,9 +18,9 @@
 
 
 Name:           gnome-desktop
-Version:        2.28.0
+Version:        2.29.4
 Release:        1
-License:        GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
+License:        GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
 Summary:        The GNOME Desktop API Library
 Url:            http://www.gnome.org
 Group:          System/GUI/GNOME
@@ -56,7 +56,7 @@ distribution: the GPL, GNOME's .desktop files, the gnome-about program,
 some man pages, and GNOME's core graphics files and icons.
 
 %package -n libgnome-desktop-2-11
-License:        GFDL v1.1 ; GPL v2 or later ; LGPL v2.1 or later
+License:        GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
 Summary:        The GNOME Desktop API Library
 Group:          System/GUI/GNOME
 Requires:       %{name}-lang = %{version}
@@ -72,7 +72,7 @@ distribution: the GPL, GNOME's .desktop files, the gnome-about program,
 some man pages, and GNOME's core graphics files and icons.
 
 %package devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/GNOME
 Requires:       gconf2-devel
@@ -105,6 +105,9 @@ make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
+%if 0%{?suse_version} <= 1120
+%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+%endif
 %find_lang %{name}-2.0
 %find_lang fdl %{name}-2.0.lang
 %find_lang gpl %{name}-2.0.lang

From 799a696ff48481af2ae3cefcf0da335dad2c185c3a8e20a904a63ce656557d9b Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Tue, 29 Dec 2009 23:20:08 +0000
Subject: [PATCH 6/7] checked in

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=65
---
 gnome-desktop-2.29.3.tar.bz2 | 3 +++
 gnome-desktop-2.29.4.tar.bz2 | 3 ---
 gnome-desktop.changes        | 9 ---------
 gnome-desktop.spec           | 4 ++--
 4 files changed, 5 insertions(+), 14 deletions(-)
 create mode 100644 gnome-desktop-2.29.3.tar.bz2
 delete mode 100644 gnome-desktop-2.29.4.tar.bz2

diff --git a/gnome-desktop-2.29.3.tar.bz2 b/gnome-desktop-2.29.3.tar.bz2
new file mode 100644
index 0000000..0a192a6
--- /dev/null
+++ b/gnome-desktop-2.29.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5149b966a95b3d9fada30c9f08b23a8a955b06bf5b88730e74378bb347eb482c
+size 1615623
diff --git a/gnome-desktop-2.29.4.tar.bz2 b/gnome-desktop-2.29.4.tar.bz2
deleted file mode 100644
index 9267eea..0000000
--- a/gnome-desktop-2.29.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:25e016d9ac169bf96f2c0b9ee2d44e91c889861969c0d58c5c77ec288d012963
-size 1616707
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index bdc1e75..daa309d 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-Wed Dec 23 10:22:42 CET 2009 - vuntz@opensuse.org
-
-- Update to version 2.29.4:
-  + GnomeBG:
-    - Per-monitor background support
-    - Memory leak fixes
-  + Updated translations.
-
 -------------------------------------------------------------------
 Wed Dec  2 11:33:44 CET 2009 - vuntz@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 678afa0..b18eda3 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-desktop (Version 2.29.4)
+# spec file for package gnome-desktop (Version 2.29.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           gnome-desktop
-Version:        2.29.4
+Version:        2.29.3
 Release:        1
 License:        GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
 Summary:        The GNOME Desktop API Library

From 45ce2a1cdcdf2877264ced69a975dea030644f5afca48e375826b4c3a565cb8f Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Tue, 29 Dec 2009 23:20:09 +0000
Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/gnome-desktop
 revision 59.0

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=dcd893e223744bd0af9dd7c09e3a9ff3
---
 gnome-desktop-2.29.3.tar.bz2 | 3 ---
 gnome-desktop-2.29.4.tar.bz2 | 3 +++
 gnome-desktop.changes        | 9 +++++++++
 gnome-desktop.spec           | 4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)
 delete mode 100644 gnome-desktop-2.29.3.tar.bz2
 create mode 100644 gnome-desktop-2.29.4.tar.bz2

diff --git a/gnome-desktop-2.29.3.tar.bz2 b/gnome-desktop-2.29.3.tar.bz2
deleted file mode 100644
index 0a192a6..0000000
--- a/gnome-desktop-2.29.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5149b966a95b3d9fada30c9f08b23a8a955b06bf5b88730e74378bb347eb482c
-size 1615623
diff --git a/gnome-desktop-2.29.4.tar.bz2 b/gnome-desktop-2.29.4.tar.bz2
new file mode 100644
index 0000000..9267eea
--- /dev/null
+++ b/gnome-desktop-2.29.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25e016d9ac169bf96f2c0b9ee2d44e91c889861969c0d58c5c77ec288d012963
+size 1616707
diff --git a/gnome-desktop.changes b/gnome-desktop.changes
index daa309d..bdc1e75 100644
--- a/gnome-desktop.changes
+++ b/gnome-desktop.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec 23 10:22:42 CET 2009 - vuntz@opensuse.org
+
+- Update to version 2.29.4:
+  + GnomeBG:
+    - Per-monitor background support
+    - Memory leak fixes
+  + Updated translations.
+
 -------------------------------------------------------------------
 Wed Dec  2 11:33:44 CET 2009 - vuntz@opensuse.org
 
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index b18eda3..678afa0 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package gnome-desktop (Version 2.29.3)
+# spec file for package gnome-desktop (Version 2.29.4)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 
 
 Name:           gnome-desktop
-Version:        2.29.3
+Version:        2.29.4
 Release:        1
 License:        GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
 Summary:        The GNOME Desktop API Library