rpms/sabayon/devel .cvsignore, 1.5, 1.6 sabayon.spec, 1.11, 1.12 sources, 1.5, 1.6

Mon Aug 1 18:21:57 UTC 2005

Author: markmc

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

Modified Files:
	.cvsignore sabayon.spec sources 
Log Message:
* 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
- 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
- Remove sabayon-monitor and monitorwindow.py
- Icon is now installed in the icon theme; update the
  icon cache in %post and %postun
- Require pygtk 2.7.1 in FC5 for MessageDialog fix (gnome #311226)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	18 May 2005 16:26:27 -0000	1.5
+++ .cvsignore	1 Aug 2005 18:21:55 -0000	1.6
@@ -1 +1 @@
-sabayon-0.18.tar.bz2
+sabayon-2.11.90.tar.bz2


Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sabayon.spec	18 May 2005 16:26:27 -0000	1.11
+++ sabayon.spec	1 Aug 2005 18:21:55 -0000	1.12
@@ -1,11 +1,12 @@
-%define pygtk2_version 2.5.3-2
+%define gtk2_version 2.7.4
+%define pygtk2_version 2.7.1
 %define gnome_python2_version 2.6.0-5
 
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")}
 
 Name:    sabayon
-Version: 0.18
+Version: 2.11.90
 Release: 1
 Summary: Tool to maintain user profiles in a GNOME desktop
 
@@ -15,7 +16,6 @@
 Source:  http://ftp.gnome.org/pub/GNOME/sources/sabayon/%{version}/sabayon-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
 
 Requires: python-abi = %{pyver}
 Requires: gamin-python
@@ -23,7 +23,10 @@
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: gnome-python2-gconf >= %{gnome_python2_version}
 
-BuildRequires: python
+BuildRequires: python-devel
+BuildRequires: pygtk2-devel
+BuildRequires: gtk2-devel
+BuildRequires: xorg-x11-devel
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: usermode
@@ -31,6 +34,9 @@
 Requires(post):  shadow-utils
 Requires(preun): shadow-utils
 
+Requires(post):   gtk2 >= %{gtk2_version}
+Requires(postun): gtk2 >= %{gtk2_version}
+
 %description
 Sabayon is a tool to help sysadmins and user change and maintain the
 default behaviour of the GNOME desktop.
@@ -71,6 +77,10 @@
   --add-category X-Fedora-Extra					\
   $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
+
 %find_lang sabayon
 
 %clean
@@ -81,7 +91,18 @@
 /usr/sbin/useradd  -r -s /sbin/nologin -c "Sabayon user" -g %{name}-admin %{name}-admin &>/dev/null || :
 /usr/sbin/usermod -d "" %{name}-admin &>/dev/null || :
 
+%post admin
+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
+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 || :
@@ -101,38 +122,18 @@
 %{_sbindir}/%{name}-apply
 
 %dir %{python_sitelib}/%{name}/
-%{python_sitelib}/%{name}/__init__.py
-%{python_sitelib}/%{name}/__init__.pyc
-%ghost %{python_sitelib}/%{name}/__init__.pyo
-%{python_sitelib}/%{name}/config.py
-%{python_sitelib}/%{name}/config.pyc
-%ghost %{python_sitelib}/%{name}/config.pyo
-%{python_sitelib}/%{name}/cache.py
-%{python_sitelib}/%{name}/cache.pyc
-%ghost %{python_sitelib}/%{name}/cache.pyo
-%{python_sitelib}/%{name}/dirmonitor.py
-%{python_sitelib}/%{name}/dirmonitor.pyc
-%ghost %{python_sitelib}/%{name}/dirmonitor.pyo
-%{python_sitelib}/%{name}/mozilla_bookmarks.py
-%{python_sitelib}/%{name}/mozilla_bookmarks.pyc
-%ghost %{python_sitelib}/%{name}/mozilla_bookmarks.pyo
-%{python_sitelib}/%{name}/storage.py
-%{python_sitelib}/%{name}/storage.pyc
-%ghost %{python_sitelib}/%{name}/storage.pyo
-%{python_sitelib}/%{name}/userdb.py
-%{python_sitelib}/%{name}/userdb.pyc
-%ghost %{python_sitelib}/%{name}/userdb.pyo
-%{python_sitelib}/%{name}/userprofile.py
-%{python_sitelib}/%{name}/userprofile.pyc
-%ghost %{python_sitelib}/%{name}/userprofile.pyo
-%{python_sitelib}/%{name}/util.py
-%{python_sitelib}/%{name}/util.pyc
-%ghost %{python_sitelib}/%{name}/util.pyo
+%{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
-%{python_sitelib}/%{name}/sources/*.pyc
-%ghost %{python_sitelib}/%{name}/sources/*.pyo
+%{python_sitelib}/%{name}/sources/*.py*
 
 %files admin
 %doc doc/index.html doc/testing.html doc/helping.html doc/developing.html
@@ -147,40 +148,37 @@
 
 %{_datadir}/%{name}/glade/%{name}.glade
 %{_datadir}/applications/gnome-%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
-%{python_sitelib}/%{name}/aboutdialog.py
-%{python_sitelib}/%{name}/aboutdialog.pyc
-%ghost %{python_sitelib}/%{name}/aboutdialog.pyo
-%{python_sitelib}/%{name}/editorwindow.py
-%{python_sitelib}/%{name}/editorwindow.pyc
-%ghost %{python_sitelib}/%{name}/editorwindow.pyo
-%{python_sitelib}/%{name}/fileviewer.py
-%{python_sitelib}/%{name}/fileviewer.pyc
-%ghost %{python_sitelib}/%{name}/fileviewer.pyo
-%{python_sitelib}/%{name}/gconfviewer.py
-%{python_sitelib}/%{name}/gconfviewer.pyc
-%ghost %{python_sitelib}/%{name}/gconfviewer.pyo
-%{python_sitelib}/%{name}/monitorwindow.py
-%{python_sitelib}/%{name}/monitorwindow.pyc
-%ghost %{python_sitelib}/%{name}/monitorwindow.pyo
-%{python_sitelib}/%{name}/profilesdialog.py
-%{python_sitelib}/%{name}/profilesdialog.pyc
-%ghost %{python_sitelib}/%{name}/profilesdialog.pyo
-%{python_sitelib}/%{name}/protosession.py
-%{python_sitelib}/%{name}/protosession.pyc
-%ghost %{python_sitelib}/%{name}/protosession.pyo
-%{python_sitelib}/%{name}/saveconfirm.py
-%{python_sitelib}/%{name}/saveconfirm.pyc
-%ghost %{python_sitelib}/%{name}/saveconfirm.pyo
-%{python_sitelib}/%{name}/usermod.py
-%{python_sitelib}/%{name}/usermod.pyc
-%ghost %{python_sitelib}/%{name}/usermod.pyo
-%{python_sitelib}/%{name}/usersdialog.py
-%{python_sitelib}/%{name}/usersdialog.pyc
-%ghost %{python_sitelib}/%{name}/usersdialog.pyo
+%{python_sitelib}/%{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*
 
 %changelog
+* 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
+- 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
+- Remove sabayon-monitor and monitorwindow.py
+- Icon is now installed in the icon theme; update the
+  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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 May 2005 16:26:27 -0000	1.5
+++ sources	1 Aug 2005 18:21:55 -0000	1.6
@@ -1 +1 @@
-19ff89c6f3c95bfc48a3b94d7998c676  sabayon-0.18.tar.bz2
+a2418e9ba94917dba8762c42de8f6740  sabayon-2.11.90.tar.bz2


