rpms/sabayon/devel sabayon.spec,1.58,1.59

[Tomas Bzatek]

Author: tbzatek

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

Modified Files:
	sabayon.spec 
Log Message:
* Fri Apr  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-2
- Fix some gconf crashes (gnome #576445)
- Temporarily switched back to Xnest to get working keyboard (gnome #576447)



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sabayon.spec	23 Mar 2009 10:09:25 -0000	1.58
+++ sabayon.spec	3 Apr 2009 16:14:50 -0000	1.59
@@ -8,7 +8,7 @@
 
 Name:    sabayon
 Version: 2.25.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -27,8 +27,12 @@
 # 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
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=576445
+Patch6:  sabayon-2.25.0-gconf-crashes.patch
+
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -78,7 +82,8 @@
 Summary:  The parts of sabayon needed on the client systems
 Group:    Applications/System
 
-Requires: xorg-x11-server-Xephyr
+# Requires: xorg-x11-server-Xephyr
+Requires: xorg-x11-server-Xnest
 Requires: shadow-utils
 Requires: gamin-python
 Requires: python-ldap
@@ -98,10 +103,13 @@
 # More modern pam file
 cp %{SOURCE2} admin-tool/
 
-%patch1 -p1 -b .xephyr
+# %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
+%patch6 -p1 -b .gconf
+
 
 %build
 
@@ -290,6 +298,10 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Fri Apr  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-2
+- Fix some gconf crashes (gnome #576445)
+- Temporarily switched back to Xnest to get working keyboard (gnome #576447)
+
 * Fri Mar 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.25.0-1
 - Update to 2.25.0