rpms/sabayon/devel .cvsignore, 1.18, 1.19 sabayon.spec, 1.49, 1.50 selinux.patch, 1.1, 1.2 sources, 1.18, 1.19 sabayon-nosu.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5971

Modified Files:
	.cvsignore sabayon.spec selinux.patch sources 
Removed Files:
	sabayon-nosu.patch 
Log Message:
2.22.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	20 Jan 2008 20:41:10 -0000	1.18
+++ .cvsignore	12 Mar 2008 01:11:35 -0000	1.19
@@ -1 +1 @@
-sabayon-2.21.0.tar.bz2
+sabayon-2.22.0.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sabayon.spec	22 Feb 2008 16:26:57 -0000	1.49
+++ sabayon.spec	12 Mar 2008 01:11:35 -0000	1.50
@@ -7,14 +7,14 @@
 %define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.21.0
-Release: 3%{?dist}
+Version: 2.22.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.20/sabayon-%{version}.tar.bz2
+Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/2.22/sabayon-%{version}.tar.bz2
 Source2: sabayon.pam
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,8 +23,6 @@
 Patch1:  sabayon-2.12.3-xnestbug.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=486218 
 Patch3:  selinux.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=479771
-Patch4:  sabayon-nosu.patch
 
 Requires: %{name}-apply = %{version}-%{release}
 Requires: libxml2-python
@@ -95,7 +93,6 @@
 
 %patch1 -p1 -b .xnestbug
 %patch3 -p1 -b .selinux
-%patch4 -p1 -b .nosu
 
 %build
 
@@ -284,6 +281,9 @@
 %ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Tue Mar 11 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-1
+- Update to 2.22.0
+
 * Fri Feb 22 2008 Tomas Bzatek <tbzatek at redhat.com> - 2.21.0-3
 - sabayon-apply requires libxml2-python (#428351) and gnome-python2 stuff
 

selinux.patch:

Index: selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- selinux.patch	13 Oct 2007 02:57:18 -0000	1.1
+++ selinux.patch	12 Mar 2008 01:11:35 -0000	1.2
@@ -1,31 +1,6 @@
-diff -up sabayon-2.20.1/lib/userdb.py.selinux sabayon-2.20.1/lib/userdb.py
---- sabayon-2.20.1/lib/userdb.py.selinux	2007-09-19 20:21:09.000000000 -0400
-+++ sabayon-2.20.1/lib/userdb.py	2007-10-12 15:43:14.000000000 -0400
-@@ -28,6 +28,7 @@ import random
- import ldap
- import socket
- import debuglog
-+import selinux
- 
- defaultConf="""<profiles>
-   <default profile=""/>
-@@ -353,7 +354,12 @@ class UserDatabase:
- 
- 	    raise UserDatabaseException(
- 	              _("Failed to save UserDatabase to %s") % filename)
--	
-+
-+        if selinux.is_selinux_enabled() > 0:
-+            rc, con = selinux.matchpathcon(filename, 0)
-+            if rc == 0:
-+                selinux.setfilecon(filename, con)
-+
- 	self.modified = 0
- 
-     def set_default_profile (self, profile):
-diff -up sabayon-2.20.1/admin-tool/profilesdialog.py.selinux sabayon-2.20.1/admin-tool/profilesdialog.py
---- sabayon-2.20.1/admin-tool/profilesdialog.py.selinux	2007-09-19 20:19:27.000000000 -0400
-+++ sabayon-2.20.1/admin-tool/profilesdialog.py	2007-10-12 15:43:14.000000000 -0400
+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
  import debuglog
  import errors
@@ -46,3 +21,26 @@
          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
+ import ldap
+ import socket
+ import debuglog
++import selinux
+ 
+ defaultConf="""<profiles>
+   <default profile=""/>
+@@ -354,6 +355,11 @@ class UserDatabase:
+             raise UserDatabaseException(
+                 _("Failed to save UserDatabase to %s") % filename)
+ 
++        if selinux.is_selinux_enabled() > 0:
++            rc, con = selinux.matchpathcon(filename, 0)
++            if rc == 0:
++                selinux.setfilecon(filename, con)
++ 
+         self.modified = 0
+ 
+     def set_default_profile (self, profile):


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	20 Jan 2008 20:41:10 -0000	1.18
+++ sources	12 Mar 2008 01:11:35 -0000	1.19
@@ -1 +1 @@
-ea5bd1e1bb0407d4f383d7617958adf2  sabayon-2.21.0.tar.bz2
+39159282db60bfdfcd8569ecb5a992f5  sabayon-2.22.0.tar.bz2


--- sabayon-nosu.patch DELETED ---