rpms/sabayon/F-12 .cvsignore, 1.25, 1.26 sabayon.spec, 1.67, 1.68 selinux.patch, 1.3, 1.4 sources, 1.25, 1.26 sabayon-2.29.2-paneldelegate-race.patch, 1.1, NONE
Warren Togami 砥上勇
wtogami at fedoraproject.org
Thu Dec 10 16:24:58 UTC 2009
Author: wtogami
Update of /cvs/pkgs/rpms/sabayon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22094
Modified Files:
.cvsignore sabayon.spec selinux.patch sources
Removed Files:
sabayon-2.29.2-paneldelegate-race.patch
Log Message:
2.29.2 fixes important bugs and adds group apply which is considered important
upstream considers this to be the most stable release
"sabayon version number is IN NO WAY tied to gnome's version number"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sabayon/F-12/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- .cvsignore 27 Oct 2009 10:46:16 -0000 1.25
+++ .cvsignore 10 Dec 2009 16:24:57 -0000 1.26
@@ -1 +1 @@
-sabayon-2.28.1.tar.bz2
+sabayon-2.29.2.tar.bz2
Index: sabayon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sabayon/F-12/sabayon.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- sabayon.spec 9 Dec 2009 12:02:38 -0000 1.67
+++ sabayon.spec 10 Dec 2009 16:24:57 -0000 1.68
@@ -7,20 +7,17 @@
%define sabayon_user_uid 86
Name: sabayon
-Version: 2.28.1
-Release: 2%{?dist}
+Version: 2.29.2
+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)
-
-# from upstream
-Patch1: sabayon-2.29.2-paneldelegate-race.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=486218
Patch3: selinux.patch
@@ -58,6 +55,10 @@ BuildRequires: autoconf
BuildRequires: perl(XML::Parser)
BuildRequires: pyxdg
+BuildRequires: gnome-doc-utils
+# scrollkeeper replacement
+BuildRequires: rarian-compat
+
Requires(post): shadow-utils
Requires(preun): shadow-utils
@@ -91,7 +92,6 @@ that need to be installed on the client
%prep
%setup -q
-%patch1 -p1 -b .race
%patch3 -p1 -b .selinux
@@ -186,9 +186,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
@@ -208,8 +208,8 @@ fi
%ghost %{python_sitearch}/%{name}/sources/*.pyo
%files
-%doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
-%doc doc/sabayon.css doc/*.jpg doc/*.gif
+%doc %{_datadir}/gnome/help/sabayon/*
+%doc %{_datadir}/omf/sabayon/*
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
@@ -242,6 +242,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
@@ -273,11 +276,11 @@ fi
%ghost %{python_sitearch}/%{name}/lockdown/*.pyo
%changelog
-* Wed Dec 9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-2
-- Fixed race conditions while catching panel events
+* Wed Dec 9 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.29.2-1
+- Update to 2.29.2
-* Tue Oct 27 2009 Tomas Bzatek <tbzatek at redhat.com> - 2.28.1-1
-- Update to 2.28.1
+* 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
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/pkgs/rpms/sabayon/F-12/selinux.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- selinux.patch 23 Oct 2009 09:40:44 -0000 1.3
+++ selinux.patch 10 Dec 2009 16:24:57 -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/pkgs/rpms/sabayon/F-12/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 27 Oct 2009 10:46:16 -0000 1.25
+++ sources 10 Dec 2009 16:24:57 -0000 1.26
@@ -1 +1 @@
-eaadfd1ca66677ff02114265ebff5de6 sabayon-2.28.1.tar.bz2
+961b7d2fcc196256e82a0fd80acbdee4 sabayon-2.29.2.tar.bz2
--- sabayon-2.29.2-paneldelegate-race.patch DELETED ---
More information about the fedora-extras-commits
mailing list