rpms/sabayon/devel sabayon.spec,1.70,1.71

Tomas Bzatek tbzatek at fedoraproject.org
Fri Jan 15 14:49:31 UTC 2010 

Author: tbzatek

Update of /cvs/extras/rpms/sabayon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9516

Modified Files:
	sabayon.spec 
Log Message:
* Fri Jan 15 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.5-2
- Cleanup for package review



Index: sabayon.spec
===================================================================
RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sabayon.spec	14 Jan 2010 18:07:51 -0000	1.70
+++ sabayon.spec	15 Jan 2010 14:49:31 -0000	1.71
@@ -2,13 +2,13 @@
 %define pygtk2_version 2.15.0
 %define gnome_python2_version 2.6.0-5
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global 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.29.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tool to maintain user profiles in a GNOME desktop
 
 Group:   Applications/System
@@ -26,10 +26,6 @@ Requires: gnome-python2-gconf >= %{gnome
 Requires: pyxdg
 Requires: pessulus
 
-# Old package name
-Provides: sabayon-admin
-Obsoletes: sabayon-admin
-
 BuildRequires: pessulus
 BuildRequires: python-devel
 BuildRequires: pygtk2-devel
@@ -39,19 +35,13 @@ BuildRequires: libXt-devel
 BuildRequires: gettext
 BuildRequires: desktop-file-utils
 BuildRequires: usermode
+BuildRequires: pyxdg
 BuildRequires: xorg-x11-server-Xephyr
 # Needed to pick up the right Xsession file
 BuildRequires: xorg-x11-xinit
 
-# Needed for patch 2 (libdir fix)
 BuildRequires: intltool
 BuildRequires: libtool
-BuildRequires: automake
-BuildRequires: autoconf
-
-# Required by intltool
-BuildRequires: perl(XML::Parser)
-BuildRequires: pyxdg
 
 BuildRequires: gnome-doc-utils
 # scrollkeeper replacement
@@ -65,7 +55,7 @@ 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. This package contains the
+default behavior of the GNOME desktop. This package contains the
 graphical tools which a sysadmin use to manage Sabayon profiles.
 
 %package  apply
@@ -84,31 +74,42 @@ Requires: gnome-python2-gconf >= %{gnome
 
 %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
+default behavior of the GNOME desktop. This package contains the files
 that need to be installed on the client systems.
 
 %prep
 %setup -q -n %{name}-%{version}
 
+# https://fedoraproject.org/wiki/Features/SystemPythonExecutablesUseSystemPython
+# replace "/usr/bin/env python" with a "/usr/bin/python"
+for i in lib/unittests.py admin-tool/sabayon admin-tool/sabayon-session admin-tool/sabayon-apply ; do
+   sed -i.bak 's|^#!/usr/bin/env python|#!/usr/bin/python|g' $i
+   touch -r ${i}.bak $i
+   rm ${i}.bak
+done
+
+
 %build
 %configure					\
 	--enable-console-helper=yes		\
-	 --with-prototype-user=%{name}
+	--with-prototype-user=%{name}
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 gzip -9 ChangeLog
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{_sysconfdir}
+export PAM_PREFIX=%{buildroot}%{_sysconfdir}
+make DESTDIR=%{buildroot} install
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2
 echo 'include "$(HOME)/.gconf.path.defaults"'  > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-defaults.path
 echo 'include "$(HOME)/.gconf.path.mandatory"' > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2/local-mandatory.path
 
 desktop-file-install --vendor gnome --delete-original		\
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications			\
-  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+	--dir $RPM_BUILD_ROOT%{_datadir}/applications		\
+	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 # We don't want these
 rm -f $RPM_BUILD_ROOT%{python_sitearch}/%{name}/xlib.la
@@ -152,7 +153,6 @@ fi
 %defattr(-, root, root, 755)
 
 %doc AUTHORS NEWS README TODO ISSUES
-# Wasn't in tarball for 2.12.3: sabayon.schema
 
 %config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path
 %config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path
@@ -163,44 +163,21 @@ fi
 %{_sbindir}/%{name}-apply
 
 %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}/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
-%{python_sitearch}/%{name}/util.py
-%{python_sitearch}/%{name}/util.pyc
-%ghost %{python_sitearch}/%{name}/util.pyo
-%{python_sitearch}/%{name}/debuglog.py
-%{python_sitearch}/%{name}/debuglog.pyc
-%ghost %{python_sitearch}/%{name}/debuglog.pyo
-%{python_sitearch}/%{name}/errors.py
-%{python_sitearch}/%{name}/errors.pyc
-%ghost %{python_sitearch}/%{name}/errors.pyo
+# https://fedoraproject.org/wiki/Packaging/Python#Including_pyos
+%{python_sitearch}/%{name}/__init__.py*
+%{python_sitearch}/%{name}/config.py*
+%{python_sitearch}/%{name}/cache.py*
+%{python_sitearch}/%{name}/dirmonitor.py*
+%{python_sitearch}/%{name}/mozilla_bookmarks.py*
+%{python_sitearch}/%{name}/storage.py*
+%{python_sitearch}/%{name}/systemdb.py*
+%{python_sitearch}/%{name}/userprofile.py*
+%{python_sitearch}/%{name}/util.py*
+%{python_sitearch}/%{name}/debuglog.py*
+%{python_sitearch}/%{name}/errors.py*
 
 %dir %{python_sitearch}/%{name}/sources
-%{python_sitearch}/%{name}/sources/*.py
-%{python_sitearch}/%{name}/sources/*.pyc
-%ghost %{python_sitearch}/%{name}/sources/*.pyo
+%{python_sitearch}/%{name}/sources/*.py*
 
 %files
 %doc %{_datadir}/gnome/help/sabayon/*
@@ -220,53 +197,28 @@ fi
 
 %{python_sitearch}/%{name}/xlib.so
 
-%{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}/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
-%{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
+%{python_sitearch}/%{name}/aboutdialog.py*
+%{python_sitearch}/%{name}/changeswindow.py*
+%{python_sitearch}/%{name}/editorwindow.py*
+%{python_sitearch}/%{name}/fileviewer.py*
+%{python_sitearch}/%{name}/gconfviewer.py*
+%{python_sitearch}/%{name}/groupsdialog.py*
+%{python_sitearch}/%{name}/profilesdialog.py*
+%{python_sitearch}/%{name}/protosession.py*
+%{python_sitearch}/%{name}/saveconfirm.py*
+%{python_sitearch}/%{name}/sessionwidget.py*
+%{python_sitearch}/%{name}/sessionwindow.py*
+%{python_sitearch}/%{name}/usermod.py*
+%{python_sitearch}/%{name}/usersdialog.py*
+%{python_sitearch}/%{name}/lockdownappliersabayon.py*
 %{_mandir}/man8/*
 %{_datadir}/sabayon/ui/
 
 
 %changelog
+* Fri Jan 15 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.29.5-2
+- Cleanup for package review
+
 * Thu Jan 14 2010 Warren Togami <wtogami at redhat.com> - 2.29.5-1
 - 2.29.5 (no code changes since rc2)

More information about the scm-commits mailing list