diff commited package against linked revision 21a70ae2b088f1f3d8bd501a5da33e35

Index: sabayon-bnc471897-xauth-environment-variable.diff
===================================================================
--- sabayon-bnc471897-xauth-environment-variable.diff (revision 21a70ae2b088f1f3d8bd501a5da33e35)
+++ sabayon-bnc471897-xauth-environment-variable.diff (revision c4f6dc90bc2cc0acedba4389a64b72eb)
@@ -1,14 +0,0 @@
-bnc471897 - Put XAUTHLOCALHOSTNAME in the child session's environment
-
-diff --git a/admin-tool/profilesdialog.py b/admin-tool/profilesdialog.py
-index 50fea5a..3686af0 100755
---- a/admin-tool/profilesdialog.py
-+++ b/admin-tool/profilesdialog.py
-@@ -184,6 +184,7 @@ class Session (gobject.GObject):
- 
-         if self.temp_xauth_path:
-             new_environ.append ("XAUTHORITY=%s" % self.temp_xauth_path)
-+            new_environ.append ("XAUTHLOCALHOSTNAME=%s" % os.environ["XAUTHLOCALHOSTNAME"])
- 
-         return new_environ
- 
Index: sabayon.changes
===================================================================
--- sabayon.changes (revision 21a70ae2b088f1f3d8bd501a5da33e35)
+++ sabayon.changes (revision c4f6dc90bc2cc0acedba4389a64b72eb)
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Sep  6 17:33:36 CEST 2011 - sbrabec@suse.cz
+
+- Removed obsolete po tarball, use translation-update-upstream.
+- Removed incorrectly rebased
+  sabayon-bnc471897-xauth-environment-variable.diff that duplicates
+  code.
+
+-------------------------------------------------------------------
 Thu Feb  4 12:37:14 PST 2010 - gburt@suse.de
 
 - Update translations
Index: sabayon.spec
===================================================================
--- sabayon.spec (revision 21a70ae2b088f1f3d8bd501a5da33e35)
+++ sabayon.spec (revision c4f6dc90bc2cc0acedba4389a64b72eb)
@@ -26,7 +26,6 @@
 License:        GPL v2 or later
 Url:            http://www.gnome.org/projects/sabayon/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.19/sabayon-%{version}.tar.bz2
-Source1:        %{name}-po.tar.bz2
 BuildRequires:  fdupes
 BuildRequires:  gtk2-devel
 BuildRequires:  intltool
@@ -48,8 +47,6 @@
 Requires:       %{name}-lang = %{version}
 Patch1:         sabayon-desktop-file-name.diff
 Patch2:         sabayon-desktop-file-categories.diff
-# PATCH-FIX-UPSTREAM sabayon-bnc471897-xauth-environment-variable.diff bnc471897 federico@novell.com - Fix xauth for the child session
-Patch5:         sabayon-bnc471897-xauth-environment-variable.diff
 %py_requires
 
 %description
@@ -86,11 +83,10 @@
 
 %lang_package
 %prep
-%setup -q -a1
+%setup -q
 translation-update-upstream
 %patch1 -p1
 %patch2 -p1
-%patch5 -p1
 chmod -x doc/*
 
 %build
Index: sabayon-po.tar.bz2
===================================================================
Binary files sabayon-po.tar.bz2 (revision 21a70ae2b088f1f3d8bd501a5da33e35) deleted