rpms/sabayon/devel .cvsignore, 1.24, 1.25 sabayon.spec, 1.65, 1.66 selinux.patch, 1.3, 1.4 sources, 1.24, 1.25

Tomas Bzatek tbzatek at fedoraproject.org
Tue Oct 27 13:25:05 UTC 2009


Author: tbzatek

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

Modified Files:
	.cvsignore sabayon.spec selinux.patch sources 
Log Message:
* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.0-1
- Update to 2.29.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore	22 Sep 2009 08:37:24 -0000	1.24
+++ .cvsignore	27 Oct 2009 13:25:04 -0000	1.25
@@ -1 +1 @@
-sabayon-2.28.0.tar.bz2
+sabayon-2.29.0.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- sabayon.spec	23 Oct 2009 09:42:20 -0000	1.65
+++ sabayon.spec	27 Oct 2009 13:25:04 -0000	1.66
@@ -7,14 +7,14 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.28.0
-Release: 2%{?dist}
+Version: 2.29.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.28/sabayon-%{version}.tar.bz2
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.29/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -182,9 +182,9 @@ fi
 %{python_sitearch}/%{name}/storage.py
 %{python_sitearch}/%{name}/storage.pyc
 %ghost %{python_sitearch}/%{name}/storage.pyo
-%{python_sitearch}/%{name}/userdb.py
-%{python_sitearch}/%{name}/userdb.pyc
-%ghost %{python_sitearch}/%{name}/userdb.pyo
+%{python_sitearch}/%{name}/systemdb.py
+%{python_sitearch}/%{name}/systemdb.pyc
+%ghost %{python_sitearch}/%{name}/systemdb.pyo
 %{python_sitearch}/%{name}/userprofile.py
 %{python_sitearch}/%{name}/userprofile.pyc
 %ghost %{python_sitearch}/%{name}/userprofile.pyo
@@ -238,6 +238,9 @@ fi
 %{python_sitearch}/%{name}/gconfviewer.py
 %{python_sitearch}/%{name}/gconfviewer.pyc
 %ghost %{python_sitearch}/%{name}/gconfviewer.pyo
+%{python_sitearch}/%{name}/groupsdialog.py
+%{python_sitearch}/%{name}/groupsdialog.pyc
+%ghost %{python_sitearch}/%{name}/groupsdialog.pyo
 %{python_sitearch}/%{name}/profilesdialog.py
 %{python_sitearch}/%{name}/profilesdialog.pyc
 %ghost %{python_sitearch}/%{name}/profilesdialog.pyo
@@ -269,6 +272,9 @@ fi
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.0-1
+- Update to 2.29.0
+
 * Fri Oct 23 2009 Dan Walsh <dwalsh at redhat.com> - 2.28.0-2
 - Move errors to sabayon-apply package
 - Only trap Exception on sabayon-apply error

selinux.patch:
 admin-tool/profilesdialog.py |    6 ++++++
 admin-tool/sabayon-apply     |    2 +-
 lib/systemdb.py              |    6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- selinux.patch	23 Oct 2009 09:42:21 -0000	1.3
+++ selinux.patch	27 Oct 2009 13:25:04 -0000	1.4
@@ -1,7 +1,8 @@
-diff -up sabayon-2.22.0/admin-tool/profilesdialog.py.selinux sabayon-2.22.0/admin-tool/profilesdialog.py
---- sabayon-2.22.0/admin-tool/profilesdialog.py.selinux	2008-03-11 16:41:44.000000000 -0400
-+++ sabayon-2.22.0/admin-tool/profilesdialog.py	2008-03-11 20:45:59.000000000 -0400
-@@ -34,6 +34,7 @@ import protosession
+diff --git a/admin-tool/profilesdialog.py b/admin-tool/profilesdialog.py
+index adf5ab4..d70dec3 100755
+--- a/admin-tool/profilesdialog.py
++++ b/admin-tool/profilesdialog.py
+@@ -35,6 +35,7 @@ import protosession
  import debuglog
  import errors
  from config import *
@@ -9,7 +10,7 @@ diff -up sabayon-2.22.0/admin-tool/profi
  
  def dprint (fmt, *args):
      debuglog.debug_log (False, debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL, fmt % args)
-@@ -110,6 +111,11 @@ class Session (gobject.GObject):
+@@ -111,6 +112,11 @@ class Session (gobject.GObject):
      def __copy_from_user (self, user_path, profile_path):
          os.chown (user_path, os.geteuid (), os.getegid ())
          shutil.move (user_path, profile_path)
@@ -21,19 +22,33 @@ diff -up sabayon-2.22.0/admin-tool/profi
          dprint ("Moved %s back from %s", user_path, profile_path)
  
      @errors.checked_callback (debuglog.DEBUG_LOG_DOMAIN_ADMIN_TOOL)
-diff -up sabayon-2.22.0/lib/userdb.py.selinux sabayon-2.22.0/lib/userdb.py
---- sabayon-2.22.0/lib/userdb.py.selinux	2008-03-11 16:41:44.000000000 -0400
-+++ sabayon-2.22.0/lib/userdb.py	2008-03-11 20:49:35.000000000 -0400
-@@ -28,6 +28,7 @@ import random
+diff --git a/admin-tool/sabayon-apply b/admin-tool/sabayon-apply
+index 78e8407..e8b3bbf 100755
+--- a/admin-tool/sabayon-apply
++++ b/admin-tool/sabayon-apply
+@@ -147,7 +147,7 @@ if __name__ == '__main__':
+ 
+         if errors.errors_have_recoverable_error ():
+             mprint ("There were recoverable errors while applying the profile.")
+-    except:
++    except Exception:
+         errors.errors_exit_with_fatal_exception (debuglog.DEBUG_LOG_DOMAIN_SABAYON_APPLY,
+                                                  util.get_admin_log_config_filename ())
+ 
+diff --git a/lib/systemdb.py b/lib/systemdb.py
+index 75f8caa..cec79f6 100644
+--- a/lib/systemdb.py
++++ b/lib/systemdb.py
+@@ -29,6 +29,7 @@ import random
  import ldap
  import socket
  import debuglog
 +import selinux
  
- defaultConf="""<profiles>
-   <default profile=""/>
-@@ -354,6 +355,11 @@ class UserDatabase:
-             raise UserDatabaseException(
+ #
+ # Default empty config.
+@@ -359,6 +360,11 @@ class SystemDatabase(object):
+             raise SystemDatabaseException(
                  _("Failed to save UserDatabase to %s") % filename)
  
 +        if selinux.is_selinux_enabled() > 0:
@@ -44,15 +59,3 @@ diff -up sabayon-2.22.0/lib/userdb.py.se
          self.modified = 0
  
      def set_default_profile (self, profile):
-diff -up sabayon-2.28.0/admin-tool/sabayon-apply~ sabayon-2.28.0/admin-tool/sabayon-apply
---- sabayon-2.28.0/admin-tool/sabayon-apply~	2009-09-21 16:12:03.000000000 -0400
-+++ sabayon-2.28.0/admin-tool/sabayon-apply	2009-10-22 16:23:21.000000000 -0400
-@@ -115,7 +115,7 @@ if __name__ == '__main__':
- 
-         if errors.errors_have_recoverable_error ():
-             mprint ("There were recoverable errors while applying the profile.")
--    except:
-+    except Exception:
-         errors.errors_exit_with_fatal_exception (debuglog.DEBUG_LOG_DOMAIN_SABAYON_APPLY,
-                                                  util.get_admin_log_config_filename ())
- 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources	22 Sep 2009 08:37:24 -0000	1.24
+++ sources	27 Oct 2009 13:25:04 -0000	1.25
@@ -1 +1 @@
-6cf8acabb61e88ebfe0ded14c96ab211  sabayon-2.28.0.tar.bz2
+2ced41d5025651b07911c72931358663  sabayon-2.29.0.tar.bz2




More information about the fedora-extras-commits mailing list