rpms/sabayon/devel sabayon-2.12.3-xnestbug.patch, NONE, 1.1 sabayon.spec, 1.22, 1.23

[Alexander Larsson (alexl)]

Author: alexl

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

Modified Files:
	sabayon.spec 
Added Files:
	sabayon-2.12.3-xnestbug.patch 
Log Message:
* Tue Jul 25 2006 Alexander Larsson <alexl at redhat.com> - 2.12.3-5
- Rename sabayon-admin user to sabayon (< 8 chars)
- Use registered uid/gid for user
- Rename sabayon-admin package to sabayon, sabayon becomes sabayon-apply
- Add workaround for Xnest crash in rawhide



sabayon-2.12.3-xnestbug.patch:

--- NEW FILE sabayon-2.12.3-xnestbug.patch ---
--- sabayon-2.12.3/lib/config.py.in.xnestbug	2006-07-25 18:25:03.000000000 +0200
+++ sabayon-2.12.3/lib/config.py.in	2006-07-25 18:25:34.000000000 +0200
@@ -53,7 +53,7 @@
 NOLOGIN_SHELL = "/sbin/nologin"
 SKEL_HOMEDIR  = "/etc/skel"
 
-XNEST_ARGV   = [ "@XNEST_PATH@", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
+XNEST_ARGV   = [ "@XNEST_PATH@", "-extension", "Composite", "-terminate", "-audit", "0", "-nolisten", "tcp" ]
 SESSION_ARGV = [ "@XSESSION@", "@SESSION_NAME@" ]
 USERMOD_ARGV = [ "/usr/sbin/usermod" ]
 


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sabayon.spec	24 Jul 2006 20:43:50 -0000	1.22
+++ sabayon.spec	25 Jul 2006 16:35:44 -0000	1.23
@@ -6,7 +6,7 @@
 
 Name:    sabayon
 Version: 2.12.3
-Release: 4
+Release: 5
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -17,13 +17,20 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1:  sabayon-2.12.3-xinit.patch
+# Xnest crashes unless we disable the Composite extension
+Patch2:  sabayon-2.12.3-xnestbug.patch
 
+Requires: %{name}-apply = %{version}-%{release}
 Requires: gamin-python
 Requires: libxml2-python
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: python-ldap
 Requires: gnome-python2-gconf >= %{gnome_python2_version}
 
+# Old package name
+Provides: sabayon-admin
+Obsoletes: sabayon-admin
+
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
 BuildRequires: gtk2-devel
@@ -48,25 +55,26 @@
 
 %description
 Sabayon is a tool to help sysadmins and user change and maintain the
-default behaviour of the GNOME desktop.
+default behaviour of the GNOME desktop. This package contains the
+graphical tools which a sysadmin use to manage Sabayon profiles.
 
-%package  admin
-Summary:  Graphical tools for Sabayon profile management
+%package  apply
+Summary:  The parts of sabayon needed on the client systems
 Group:    Applications/System
-Requires: %{name} = %{version}-%{release}
 
 Requires: xorg-x11-server-Xnest
 Requires: shadow-utils
 
-%description admin
-The sabayon-admin package contains the graphical tools which a
-sysadmin should use to manage Sabayon profiles.
+%description apply
+Sabayon is a tool to help sysadmins and user change and maintain the
+default behaviour of the GNOME desktop. This package contains the files
+that need to be installed on the client systems.
 
 %prep
 %setup -q
 
 %patch1 -p0 -b .xinit
-
+%patch2 -p1 -b .xnestbug
 
 %build
 # Needed for patch 1 (xinit fix)
@@ -74,7 +82,7 @@
 
 %configure					\
 	--enable-consolehelper=yes		\
-	 --with-prototype-user=%{name}-admin
+	 --with-prototype-user=%{name}
 make %{?_smp_mflags}
 gzip -9 ChangeLog
 
@@ -101,29 +109,31 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre admin
-/usr/sbin/groupadd -r %{name}-admin &>/dev/null || :
-/usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name}-admin %{name}-admin &>/dev/null || :
+%pre
+%define sabayon_user_uid 86
+/usr/sbin/groupadd -g %{sabayon_user_uid} -r %{name} &>/dev/null || :
+/usr/sbin/useradd  -r -u %{sabayon_user_uid} -s /sbin/nologin -c "Sabayon user" -g %{name} %{name} &>/dev/null || :
+# Delete the old sabayon-admin user
 /usr/sbin/usermod -d "" %{name}-admin &>/dev/null || :
 
-%post admin
+%post
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
-%postun admin
+%postun
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
 if [ $1 -eq 0 ]; then
-  /usr/sbin/userdel  %{name}-admin &>/dev/null || :
-  /usr/sbin/groupdel %{name}-admin &>/dev/null || :
+  /usr/sbin/userdel  %{name} &>/dev/null || :
+  /usr/sbin/groupdel %{name} &>/dev/null || :
 fi
 
-%files -f sabayon.lang
+%files apply -f sabayon.lang
 %defattr(-, root, root, 755)
 
 %doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES
@@ -151,7 +161,7 @@
 %dir %{python_sitelib}/%{name}/sources/
 %{python_sitelib}/%{name}/sources/*.py*
 
-%files admin
+%files
 %doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
 %doc doc/sabayon.css doc/*.jpg doc/*.gif
 
@@ -184,6 +194,12 @@
 %{python_sitelib}/%{name}/lockdown
 
 %changelog
+* Tue Jul 25 2006 Alexander Larsson <alexl at redhat.com> - 2.12.3-5
+- Rename sabayon-admin user to sabayon (< 8 chars)
+- Use registered uid/gid for user
+- Rename sabayon-admin package to sabayon, sabayon becomes sabayon-apply
+- Add workaround for Xnest crash in rawhide
+
 * Mon Jul 24 2006  <markmc at localhost.localdomain> - 2.12.3-4
 - Remove FC4 stuff
 - Add BuildRequires for autoconf and perl-XML-Parser