Hello community,

here is the log from the commit of package gnome-desktop2 for openSUSE:Factory
checked in at Wed Aug 3 16:33:56 CEST 2011.



--------
--- GNOME/gnome-desktop2/gnome-desktop2.changes 2011-04-22 11:02:11.000000000 
+0200
+++ /mounts/work_src_done/STABLE/gnome-desktop2/gnome-desktop2.changes  
2011-07-26 15:32:04.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Jul 26 15:19:23 CEST 2011 - [email protected]
+
+- Drop gnome-desktop2-X-KDE-SubstituteUID.patch: now that
+  bnc#540627 is fixed, we do not care about X-KDE-SubstituteUID
+  anymore, so we don't need the patch anymore.
+- Drop gnome-desktop2-desktop.patch: we do not build gnome-about
+  anymore, so it's not needed. And it was wrong in the first place
+  since "Learn more about GNOME" is really not a GenericName.
+- Rebase gnome-desktop2-fate300461-desktop-gettext.patch after
+  removal of gnome-desktop2-X-KDE-SubstituteUID.patch.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  gnome-desktop2-desktop.patch
  gnome-desktop2-X-KDE-SubstituteUID.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-desktop2.spec ++++++
--- /var/tmp/diff_new_pack.IeSfjG/_old  2011-08-03 16:33:38.000000000 +0200
+++ /var/tmp/diff_new_pack.IeSfjG/_new  2011-08-03 16:33:38.000000000 +0200
@@ -21,17 +21,13 @@
 Name:           gnome-desktop2
 %define _name   gnome-desktop
 Version:        2.32.1
-Release:        9
+Release:        11
 License:        LGPLv2.1+
 Summary:        The GNOME Desktop API Library
 Url:            http://www.gnome.org
 Group:          System/GUI/GNOME
 Source:         %{_name}-%{version}.tar.bz2
 Source99:       baselibs.conf
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
-Patch1:         gnome-desktop2-X-KDE-SubstituteUID.patch
-# PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
-Patch2:         gnome-desktop2-desktop.patch
 # PATCH-FEATURE-OPENSUSE gnome-desktop-recently-used-apps.patch -- Add 
launched .desktop files to recently used apps.
 Patch3:         gnome-desktop2-recently-used-apps.patch
 # PATCH-FEATURE-OPENSUSE gnome-desktop-fate300461-desktop-gettext.patch 
fate300461 [email protected] -- Look for translation of desktop entry strings 
via gettext
@@ -110,8 +106,6 @@
 %prep
 %setup -q -n %{_name}-%{version}
 translation-update-upstream
-%patch1
-%patch2 -p0
 %patch3 -p1
 %patch5 -p0
 %patch6 -p1

++++++ gnome-desktop2-fate300461-desktop-gettext.patch ++++++
--- /var/tmp/diff_new_pack.IeSfjG/_old  2011-08-03 16:33:38.000000000 +0200
+++ /var/tmp/diff_new_pack.IeSfjG/_new  2011-08-03 16:33:38.000000000 +0200
@@ -207,11 +207,11 @@
 ===================================================================
 --- libgnome-desktop/libgnome/gnome-desktop-item.h.orig
 +++ libgnome-desktop/libgnome/gnome-desktop-item.h
-@@ -97,6 +97,7 @@ typedef struct _GnomeDesktopItem GnomeDe
+@@ -95,6 +95,7 @@ typedef struct _GnomeDesktopItem GnomeDe
+ #define GNOME_DESKTOP_ITEM_SORT_ORDER "SortOrder" /* strings */
+ #define GNOME_DESKTOP_ITEM_URL                "URL" /* 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 */


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to