rpms/sabayon/devel .cvsignore, 1.21, 1.22 sabayon-lockdown-save.patch, 1.1, 1.2 sabayon.spec, 1.61, 1.62 sources, 1.21, 1.22 sabayon-2.12.3-xnestbug.patch, 1.1, NONE sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch, 1.1, NONE sabayon-2.25.0-profile-save.patch, 1.1, NONE sabayon.pam, 1.1, NONE xephyr.patch, 1.2, NONE

Tue Aug 11 14:42:39 UTC 2009

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9328

Modified Files:
	.cvsignore sabayon-lockdown-save.patch sabayon.spec sources 
Removed Files:
	sabayon-2.12.3-xnestbug.patch 
	sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch 
	sabayon-2.25.0-profile-save.patch sabayon.pam xephyr.patch 
Log Message:
* Tue Aug 11 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.0-1
- Update to 2.27.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22

--- .cvsignore	20 Mar 2009 16:36:10 -0000	1.21
+++ .cvsignore	11 Aug 2009 14:42:37 -0000	1.22
@@ -1 +1 @@
-sabayon-2.25.0.tar.bz2
+sabayon-2.27.0.tar.bz2

sabayon-lockdown-save.patch:
 config.py.in |   26 +++++++++++++++++++++++++-
 storage.py   |    4 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

Index: sabayon-lockdown-save.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon-lockdown-save.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sabayon-lockdown-save.patch	10 Sep 2008 13:17:56 -0000	1.1
+++ sabayon-lockdown-save.patch	11 Aug 2009 14:42:38 -0000	1.2
@@ -1,8 +1,51 @@
-Index: lib/storage.py
-===================================================================
---- lib/storage.py	(revision 1010)
-+++ lib/storage.py	(working copy)
-@@ -601,7 +601,7 @@
+diff -up sabayon-2.27.0/lib/config.py.in.gconfsave sabayon-2.27.0/lib/config.py.in
+--- sabayon-2.27.0/lib/config.py.in.gconfsave	2009-08-10 19:21:07.000000000 +0200
++++ sabayon-2.27.0/lib/config.py.in	2009-08-11 16:12:01.000000000 +0200
+@@ -105,6 +105,8 @@ FILES_TO_IGNORE = [
+ DIRECTORIES_TO_IGNORE = [
+     ".beagle",
+     ".cache",
++    ".ccache",
++    ".dbus",
+     ".fontconfig",
+     ".gconf",
+     ".gconf.xml.defaults",
+@@ -114,8 +116,30 @@ DIRECTORIES_TO_IGNORE = [
+     ".gstreamer-0.8",
+     ".gstreamer-0.10",
+     ".gvfs",
++    ".local/share/tracker",
++    ".metacity/sessions",
++    ".profile_cache",
++    ".pulse",
++    ".thumbnails",
++    ".wapi",
++    ".Trash"
++]
++
++#
++# Directories which we don't want to add when saving profile
++# 
++DIRECTORIES_TO_IGNORE_PROFILE = [
++    ".beagle",
++    ".cache",
++    ".ccache",
++    ".dbus",
++    ".fontconfig",
++    ".gconfd",
++    ".gstreamer-0.8",
++    ".gstreamer-0.10",
++    ".gvfs",
++    ".local/share/tracker",
+     ".metacity/sessions",
+-    ".nautilus/metafiles",
+     ".profile_cache",
+     ".pulse",
+     ".thumbnails",
+diff -up sabayon-2.27.0/lib/storage.py.gconfsave sabayon-2.27.0/lib/storage.py
+--- sabayon-2.27.0/lib/storage.py.gconfsave	2009-04-16 22:30:39.000000000 +0200
++++ sabayon-2.27.0/lib/storage.py	2009-08-11 15:27:54.000000000 +0200
+@@ -601,7 +601,7 @@ class ProfileStorage:
                          # We need to stop if we are recursing inside a ignored 
                          # directory.
                          if util.should_ignore_dir (homedir, 
@@ -11,7 +54,7 @@ Index: lib/storage.py
                              dprint ("Not going inside %s as it is an ignored directory.", path)
                          else:
                              zip_directory (save_zip,
-@@ -613,7 +613,7 @@
+@@ -613,7 +613,7 @@ class ProfileStorage:
                          if os.path.join (name, f) in zip_filelist:
                              dprint ("Not adding %s to zipfile since it is already in the file", os.path.join (name, f))
                          elif util.should_ignore_file (homedir, 
@@ -20,34 +63,3 @@ Index: lib/storage.py
                              dprint ("Not adding %s to zipfile since it is a ignored file", os.path.join (name, f))
                          else:
                              zip_filelist.append(os.path.join(name, f))
-Index: lib/config.py.in
-===================================================================
---- lib/config.py.in	(revision 1010)
-+++ lib/config.py.in	(working copy)
-@@ -121,6 +121,26 @@
- ]
- 
- #
-+# Directories which we don't want to add when saving profile
-+# 
-+DIRECTORIES_TO_IGNORE_PROFILE = [
-+    ".beagle",
-+    ".cache",
-+    ".fontconfig",
-+    ".gconf.xml.mandatory",
-+    ".gconf.xml.mandatory-alt",
-+    ".gconfd",
-+    ".gstreamer-0.8",
-+    ".gstreamer-0.10",
-+    ".metacity/sessions",
-+    ".nautilus/metafiles",
-+    ".profile_cache",
-+    ".thumbnails",
-+    ".wapi",
-+    ".Trash"
-+]
-+
-+#
- # GConf keys which we don't want to see change notifications for
- #
- GCONF_KEYS_TO_IGNORE = [


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- sabayon.spec	27 Jul 2009 03:44:21 -0000	1.61
+++ sabayon.spec	11 Aug 2009 14:42:38 -0000	1.62
@@ -1,5 +1,5 @@
 %define gtk2_version 2.6.0
-%define pygtk2_version 2.5.3-2
+%define pygtk2_version 2.15.0
 %define gnome_python2_version 2.6.0-5
 
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -7,32 +7,23 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.25.0
-Release: 4%{?dist}
+Version: 2.27.0
+Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPLv2+
 URL:     http://www.gnome.org/projects/sabayon
-Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.22/sabayon-%{version}.tar.bz2
-Source2: sabayon.pam
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.27/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Xnest crashes unless we disable the Composite extension
-Patch1:  xephyr.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486218 
 Patch3:  selinux.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=551535
 Patch4:  sabayon-lockdown-save.patch
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=576440
-Patch5:  sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=542604
-Patch7:  sabayon-2.25.0-profile-save.patch
-
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -53,7 +44,7 @@ BuildRequires: libXt-devel
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: usermode
-BuildRequires: xorg-x11-server-Xnest
+BuildRequires: xorg-x11-server-Xephyr
 # Needed to pick up the right Xsession file
 BuildRequires: xorg-x11-xinit
 
@@ -82,8 +73,7 @@ graphical tools which a sysadmin use to 
 Summary:  The parts of sabayon needed on the client systems
 Group:    Applications/System
 
-# Requires: xorg-x11-server-Xephyr
-Requires: xorg-x11-server-Xnest
+Requires: xorg-x11-server-Xephyr
 Requires: shadow-utils
 Requires: gamin-python
 Requires: python-ldap
@@ -100,15 +90,9 @@ that need to be installed on the client 
 
 %prep
 %setup -q
-# More modern pam file
-cp %{SOURCE2} admin-tool/
 
-# %patch1 -p1 -b .xephyr
-# -- temporarily disabled: https://bugzilla.gnome.org/show_bug.cgi?id=576447
 %patch3 -p1 -b .selinux
-%patch4 -p0 -b .gconfsave
-%patch5 -p1 -b .xauth
-%patch7 -p1 -b .profile
+%patch4 -p1 -b .gconfsave
 
 
 %build
@@ -298,6 +282,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Aug 11 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.27.0-1
+- Update to 2.27.0
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.25.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	20 Mar 2009 16:36:11 -0000	1.21
+++ sources	11 Aug 2009 14:42:38 -0000	1.22
@@ -1 +1 @@
-f994116c9b9194dafc0a3ec358125f8e  sabayon-2.25.0.tar.bz2
+6595e9dfeead14ad1ce73b63e62cd499  sabayon-2.27.0.tar.bz2


--- sabayon-2.12.3-xnestbug.patch DELETED ---


--- sabayon-2.25.0-XAUTHLOCALHOSTNAME.patch DELETED ---


--- sabayon-2.25.0-profile-save.patch DELETED ---


--- sabayon.pam DELETED ---


--- xephyr.patch DELETED ---


