rpms/sabayon/devel sabayon.pam, NONE, 1.1 .cvsignore, 1.10, 1.11 sabayon.spec, 1.23, 1.24 sources, 1.10, 1.11

Thu Jul 27 19:55:15 UTC 2006

Author: alexl

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

Modified Files:
	.cvsignore sabayon.spec sources 
Added Files:
	sabayon.pam 
Log Message:
* Thu Jul 27 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-1
- Update to 2.14.4
- Ghost .pyo files
- Use a more modern pam file
- Remove macros from changelog
- Add usermode dependency
- Made sabayon symlink relative
- Add dist tag

--- NEW FILE sabayon.pam ---
#%PAM-1.0
auth		include		config-util
account		include		config-util
session		include		config-util


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Mar 2006 16:40:53 -0000	1.10
+++ .cvsignore	27 Jul 2006 19:55:15 -0000	1.11
@@ -1 +1 @@
-sabayon-2.12.3.tar.bz2
+sabayon-2.12.4.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sabayon.spec	25 Jul 2006 16:35:44 -0000	1.23
+++ sabayon.spec	27 Jul 2006 19:55:15 -0000	1.24
@@ -2,29 +2,32 @@
 %define pygtk2_version 2.5.3-2
 %define gnome_python2_version 2.6.0-5
 
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
+%define sabayon_user_uid 86
 
 Name:    sabayon
-Version: 2.12.3
-Release: 5
+Version: 2.12.4
+Release: 1%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
 License: GPL
 URL:     http://www.gnome.org/projects/sabayon
 Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
+Source2: sabayon.pam
 
 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
+Patch1:  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: usermode
 Requires: gnome-python2-gconf >= %{gnome_python2_version}
 
 # Old package name
@@ -72,9 +75,10 @@
 
 %prep
 %setup -q
+# More modern pam file
+cp %{SOURCE2} admin-tool/
 
-%patch1 -p0 -b .xinit
-%patch2 -p1 -b .xnestbug
+%patch1 -p1 -b .xnestbug
 
 %build
 # Needed for patch 1 (xinit fix)
@@ -101,8 +105,11 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 # We don't want these
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/xlib.la
-rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/xlib.a
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/xlib.la
+rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/xlib.a
+
+rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %find_lang sabayon
 
@@ -110,7 +117,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -133,6 +139,7 @@
   /usr/sbin/groupdel %{name} &>/dev/null || :
 fi
 
+
 %files apply -f sabayon.lang
 %defattr(-, root, root, 755)
 
@@ -147,19 +154,39 @@
 
 %{_sbindir}/%{name}-apply
 
-%dir %{python_sitelib}/%{name}/
-%{python_sitelib}/%{name}/__init__.py*
-%{python_sitelib}/%{name}/config.py*
-%{python_sitelib}/%{name}/cache.py*
-%{python_sitelib}/%{name}/dirmonitor.py*
-%{python_sitelib}/%{name}/mozilla_bookmarks.py*
-%{python_sitelib}/%{name}/storage.py*
-%{python_sitelib}/%{name}/userdb.py*
-%{python_sitelib}/%{name}/userprofile.py*
-%{python_sitelib}/%{name}/util.py*
-
-%dir %{python_sitelib}/%{name}/sources/
-%{python_sitelib}/%{name}/sources/*.py*
+%dir %{python_sitearch}/%{name}/
+%{python_sitearch}/%{name}/__init__.py
+%{python_sitearch}/%{name}/__init__.pyc
+%ghost %{python_sitearch}/%{name}/__init__.pyo
+%{python_sitearch}/%{name}/config.py
+%{python_sitearch}/%{name}/config.pyc
+%ghost %{python_sitearch}/%{name}/config.pyo
+%{python_sitearch}/%{name}/cache.py
+%{python_sitearch}/%{name}/cache.pyc
+%ghost %{python_sitearch}/%{name}/cache.pyo
+%{python_sitearch}/%{name}/dirmonitor.py
+%{python_sitearch}/%{name}/dirmonitor.pyc
+%ghost %{python_sitearch}/%{name}/dirmonitor.pyo
+%{python_sitearch}/%{name}/mozilla_bookmarks.py
+%{python_sitearch}/%{name}/mozilla_bookmarks.pyc
+%ghost %{python_sitearch}/%{name}/mozilla_bookmarks.pyo
+%{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}/userprofile.py
+%{python_sitearch}/%{name}/userprofile.pyc
+%ghost %{python_sitearch}/%{name}/userprofile.pyo
+%{python_sitearch}/%{name}/util.py
+%{python_sitearch}/%{name}/util.pyc
+%ghost %{python_sitearch}/%{name}/util.pyo
+
+%dir %{python_sitearch}/%{name}/sources
+%{python_sitearch}/%{name}/sources/*.py
+%{python_sitearch}/%{name}/sources/*.pyc
+%ghost %{python_sitearch}/%{name}/sources/*.pyo
 
 %files
 %doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
@@ -176,24 +203,63 @@
 %{_datadir}/applications/gnome-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
-%{python_sitelib}/%{name}/xlib.so
+%{python_sitearch}/%{name}/xlib.so
 
-%{python_sitelib}/%{name}/aboutdialog.py*
-%{python_sitelib}/%{name}/changeswindow.py*
-%{python_sitelib}/%{name}/editorwindow.py*
-%{python_sitelib}/%{name}/fileviewer.py*
-%{python_sitelib}/%{name}/gconfviewer.py*
-%{python_sitelib}/%{name}/profilesdialog.py*
-%{python_sitelib}/%{name}/protosession.py*
-%{python_sitelib}/%{name}/saveconfirm.py*
-%{python_sitelib}/%{name}/sessionwidget.py*
-%{python_sitelib}/%{name}/sessionwindow.py*
-%{python_sitelib}/%{name}/usermod.py*
-%{python_sitelib}/%{name}/usersdialog.py*
-%{python_sitelib}/%{name}/lockdownappliersabayon.py*
-%{python_sitelib}/%{name}/lockdown
+%{python_sitearch}/%{name}/aboutdialog.py
+%{python_sitearch}/%{name}/aboutdialog.pyc
+%ghost %{python_sitearch}/%{name}/aboutdialog.pyo
+%{python_sitearch}/%{name}/changeswindow.py
+%{python_sitearch}/%{name}/changeswindow.pyc
+%ghost %{python_sitearch}/%{name}/changeswindow.pyo
+%{python_sitearch}/%{name}/editorwindow.py
+%{python_sitearch}/%{name}/editorwindow.pyc
+%ghost %{python_sitearch}/%{name}/editorwindow.pyo
+%{python_sitearch}/%{name}/fileviewer.py
+%{python_sitearch}/%{name}/fileviewer.pyc
+%ghost %{python_sitearch}/%{name}/fileviewer.pyo
+%{python_sitearch}/%{name}/gconfviewer.py
+%{python_sitearch}/%{name}/gconfviewer.pyc
+%ghost %{python_sitearch}/%{name}/gconfviewer.pyo
+%{python_sitearch}/%{name}/profilesdialog.py
+%{python_sitearch}/%{name}/profilesdialog.pyc
+%ghost %{python_sitearch}/%{name}/profilesdialog.pyo
+%{python_sitearch}/%{name}/protosession.py
+%{python_sitearch}/%{name}/protosession.pyc
+%ghost %{python_sitearch}/%{name}/protosession.pyo
+%{python_sitearch}/%{name}/saveconfirm.py
+%{python_sitearch}/%{name}/saveconfirm.pyc
+%ghost %{python_sitearch}/%{name}/saveconfirm.pyo
+%{python_sitearch}/%{name}/sessionwidget.py
+%{python_sitearch}/%{name}/sessionwidget.pyc
+%ghost %{python_sitearch}/%{name}/sessionwidget.pyo
+%{python_sitearch}/%{name}/sessionwindow.py
+%{python_sitearch}/%{name}/sessionwindow.pyc
+%ghost %{python_sitearch}/%{name}/sessionwindow.pyo
+%{python_sitearch}/%{name}/usermod.py
+%{python_sitearch}/%{name}/usermod.pyc
+%ghost %{python_sitearch}/%{name}/usermod.pyo
+%{python_sitearch}/%{name}/usersdialog.py
+%{python_sitearch}/%{name}/usersdialog.pyc
+%ghost %{python_sitearch}/%{name}/usersdialog.pyo
+%{python_sitearch}/%{name}/lockdownappliersabayon.py
+%{python_sitearch}/%{name}/lockdownappliersabayon.pyc
+%ghost %{python_sitearch}/%{name}/lockdownappliersabayon.pyo
+
+%dir %{python_sitearch}/%{name}/lockdown
+%{python_sitearch}/%{name}/lockdown/*.py
+%{python_sitearch}/%{name}/lockdown/*.pyc
+%ghost %{python_sitearch}/%{name}/lockdown/*.pyo
 
 %changelog
+* Thu Jul 27 2006 Alexander Larsson <alexl at redhat.com> - 2.12.4-1
+- Update to 2.14.4
+- Ghost .pyo files
+- Use a more modern pam file
+- Remove macros from changelog
+- Add usermode dependency
+- Made sabayon symlink relative
+- Add dist tag
+
 * 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
@@ -229,22 +295,22 @@
 
 * Mon May 23 2005 Mark McLoughlin <markmc at redhat.com> - 2.11.90-1
 - Update to 2.11.90
-- Don't %ghost .pyo files, package them
+- Don't ghost .pyo files, package them
 - We're no longer a noarch package
 - BuildRequire python-devel, pygtk2-devel, gtk2-devel and xorg-x11-devel
   for the xlib module
 - Add sessionwindow.py, sessionwidget.py, changeswindow.py and
-  xlib.so to %files
+  xlib.so to files
 - Remove sabayon-monitor and monitorwindow.py
 - Icon is now installed in the icon theme; update the
-  icon cache in %post and %postun
+  icon cache in post and postun
 - Require pygtk 2.7.1 in FC5 for MessageDialog fix (gnome #311226)
 
 * Wed May 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.18-1
 - Update to 0.18
 
 * Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.17-2
-- Add missing %%dir entries.
+- Add missing dir entries.
 
 * Thu Mar 24 2005 Mark McLoughlin <markmc at redhat.com> - 0.17-1
 - Update to 0.17
@@ -272,7 +338,7 @@
 - Remove period at the end of the summary
 - Specify full URL for source
 - BuildRequires: python 
-- Use %{_sysconfdir} everywhere
+- Use _sysconfdir everywhere
 - Set the directory mode
 
 * Fri Mar 18 2005 Mark McLoughlin <markmc at redhat.com> - 0.16-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Mar 2006 16:40:53 -0000	1.10
+++ sources	27 Jul 2006 19:55:15 -0000	1.11
@@ -1 +1 @@
-259b56fecdba0cb5d2c93f2999d04900  sabayon-2.12.3.tar.bz2
+2d7234d88f14c398deff050af609aab5  sabayon-2.12.4.tar.bz2


