Hello community, here is the log from the commit of package sabayon checked in at Wed Jan 24 01:43:25 CET 2007. -------- --- GNOME/sabayon/sabayon.changes 2007-01-23 14:44:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/sabayon/sabayon.changes 2007-01-23 18:38:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 23 18:38:21 CET 2007 - sbrabec@suse.cz + +- Spec file cleanup. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sabayon.spec ++++++ --- /var/tmp/diff_new_pack.Kw9168/_old 2007-01-24 01:43:16.000000000 +0100 +++ /var/tmp/diff_new_pack.Kw9168/_new 2007-01-24 01:43:16.000000000 +0100 @@ -12,7 +12,7 @@ Name: sabayon Version: 2.12.4 -Release: 40 +Release: 41 Summary: Tool to maintain user profiles in a GNOME desktop Group: System/GUI/GNOME License: GNU General Public License (GPL) @@ -22,12 +22,6 @@ %define gtk2_version 2.7.4 %define pygtk2_version 2.7.1 %define gnome_python2_version 2.6.0-5 -%define prefix /usr -%define bindir %{prefix}/bin -%define sbindir %{prefix}/sbin -%define libexecdir %{prefix}/bin -%define sysconfdir /etc -%define datadir %{prefix}/share BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libxml2-python Requires: python-gtk >= %{pygtk2_version} @@ -100,29 +94,22 @@ %patch13 -p1 %build -intltoolize --force -autoreconf -./configure \ - --prefix=%prefix \ - --libdir=%prefix/%_lib \ - --libexecdir=%libexecdir \ - --sysconfdir=%sysconfdir \ - --datadir=%prefix/share \ - --localstatedir=/var/lib \ - --enable-consolehelper=yes \ - --with-prototype-user=%{name}-admin \ +autoreconf -f -i +%configure\ + --libexecdir=%{_prefix}/lib/%{name}\ + --enable-consolehelper=yes\ + --with-prototype-user=%{name}-admin\ --with-distro=suse make %{?_smp_mflags} -gzip -9 ChangeLog %install -%makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{sysconfdir} -mkdir -p $RPM_BUILD_ROOT%{sysconfdir}/gconf/2 -# We don't want these -rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/xlib.la -rm -f $RPM_BUILD_ROOT%{py_sitedir}/%{name}/xlib.a +%makeinstall PAM_PREFIX=$RPM_BUILD_ROOT%{_sysconfdir} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/2 +rm $RPM_BUILD_ROOT%{py_sitedir}/%{name}/xlib.*a +mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps +ln -s ../icons/hicolor/48x48/apps/sabayon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ echo DocPath=sabayon >> $RPM_BUILD_ROOT/usr/share/applications/sabayon.desktop -%suse_update_desktop_file -G "Desktop Profile Administration" %name DesktopLockdown +%suse_update_desktop_file -G "Desktop Profile Administration" %{name} DesktopLockdown %find_lang %{name} %clean @@ -133,63 +120,63 @@ /usr/sbin/useradd -r -s /sbin/nologin -c "Sabayon user" -g %{name}-admin -d /var/lib/%{name}-admin %{name}-admin &>/dev/null || : %post -# Support for not customized gconf2 package: +# Support for not customized gconf2 package (<= SuSE Linux 10.1, <= SLED10): # Remove old sabayon local settings, if it has structured comments. -if test -f %{sysconfdir}/gconf/2/local-defaults.path ; then - if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-defaults.path ; then - sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-defaults.path - if ! test -s %{sysconfdir}/gconf/2/local-defaults.path ; then - rm %{sysconfdir}/gconf/2/local-defaults.path +if test -f %{_sysconfdir}/gconf/2/local-defaults.path ; then + if grep -q '^# BEGIN sabayon$' %{_sysconfdir}/gconf/2/local-defaults.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{_sysconfdir}/gconf/2/local-defaults.path + if ! test -s %{_sysconfdir}/gconf/2/local-defaults.path ; then + rm %{_sysconfdir}/gconf/2/local-defaults.path fi fi fi -if test -f %{sysconfdir}/gconf/2/local-mandatory.path ; then - if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-mandatory.path ; then - sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-mandatory.path - if ! test -s %{sysconfdir}/gconf/2/local-mandatory.path ; then - rm %{sysconfdir}/gconf/2/local-mandatory.path +if test -f %{_sysconfdir}/gconf/2/local-mandatory.path ; then + if grep -q '^# BEGIN sabayon$' %{_sysconfdir}/gconf/2/local-mandatory.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{_sysconfdir}/gconf/2/local-mandatory.path + if ! test -s %{_sysconfdir}/gconf/2/local-mandatory.path ; then + rm %{_sysconfdir}/gconf/2/local-mandatory.path fi fi fi # Include new sabayon local settings, only if gconf2 does not support it. # WARNING: These files are removed during update from 10.0+supplementary. # Never mind, new gconf2 contains these settings. -if ! fgrep -q 'include "$(HOME)/.gconf.path.defaults"' %{sysconfdir}/gconf/2/path ; then - echo -e '# BEGIN sabayon\ninclude "$(HOME)/.gconf.path.defaults"\n# END sabayon' >>%{sysconfdir}/gconf/2/local-defaults.path +if ! fgrep -q 'include "$(HOME)/.gconf.path.defaults"' %{_sysconfdir}/gconf/2/path ; then + echo -e '# BEGIN sabayon\ninclude "$(HOME)/.gconf.path.defaults"\n# END sabayon' >>%{_sysconfdir}/gconf/2/local-defaults.path fi -if ! fgrep -q 'include "$(HOME)/.gconf.path.mandatory"' %{sysconfdir}/gconf/2/path ; then - echo -e '# BEGIN sabayon\ninclude "$(HOME)/.gconf.path.mandatory"\n# END sabayon' >>%{sysconfdir}/gconf/2/local-mandatory.path +if ! fgrep -q 'include "$(HOME)/.gconf.path.mandatory"' %{_sysconfdir}/gconf/2/path ; then + echo -e '# BEGIN sabayon\ninclude "$(HOME)/.gconf.path.mandatory"\n# END sabayon' >>%{_sysconfdir}/gconf/2/local-mandatory.path fi %postun -# Support for not customized gconf2 package: +# Support for not customized gconf2 package (<= SuSE Linux 10.1, <= SLED10): # Remove old sabayon local settings on remove. if test $1 = 0 ; then - if test -f %{sysconfdir}/gconf/2/local-defaults.path ; then - if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-defaults.path ; then - sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-defaults.path - if ! test -s %{sysconfdir}/gconf/2/local-defaults.path ; then - rm %{sysconfdir}/gconf/2/local-defaults.path + if test -f %{_sysconfdir}/gconf/2/local-defaults.path ; then + if grep -q '^# BEGIN sabayon$' %{_sysconfdir}/gconf/2/local-defaults.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{_sysconfdir}/gconf/2/local-defaults.path + if ! test -s %{_sysconfdir}/gconf/2/local-defaults.path ; then + rm %{_sysconfdir}/gconf/2/local-defaults.path fi fi fi - if test -f %{sysconfdir}/gconf/2/local-mandatory.path ; then - if grep -q '^# BEGIN sabayon$' %{sysconfdir}/gconf/2/local-mandatory.path ; then - sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{sysconfdir}/gconf/2/local-mandatory.path - if ! test -s %{sysconfdir}/gconf/2/local-mandatory.path ; then - rm %{sysconfdir}/gconf/2/local-mandatory.path + if test -f %{_sysconfdir}/gconf/2/local-mandatory.path ; then + if grep -q '^# BEGIN sabayon$' %{_sysconfdir}/gconf/2/local-mandatory.path ; then + sed -i '/^# BEGIN sabayon$/,/# END sabayon/d' %{_sysconfdir}/gconf/2/local-mandatory.path + if ! test -s %{_sysconfdir}/gconf/2/local-mandatory.path ; then + rm %{_sysconfdir}/gconf/2/local-mandatory.path fi fi fi fi -%files -f sabayon.lang +%files -f %{name}.lang %defattr(-, root, root, 755) -%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES +%doc AUTHORS ChangeLog NEWS README TODO ISSUES %config(noreplace) /etc/X11/xinit/xinitrc.d/%{name}* -%{sysconfdir}/desktop-profiles -%{sbindir}/%{name}-apply -%dir %{py_sitedir}/%{name}/ +%{_sbindir}/%{name}-apply +%{_sysconfdir}/desktop-profiles +%dir %{py_sitedir}/%{name} %{py_sitedir}/%{name}/__init__.py* %{py_sitedir}/%{name}/config.py* %{py_sitedir}/%{name}/cache.py* @@ -206,13 +193,12 @@ %defattr(-, root, root, 755) %doc doc/index.html doc/testing.html doc/helping.html doc/developing.html %doc doc/sabayon.css doc/*.jpg doc/*.gif -%{bindir}/%{name} -%{libexecdir}/%{name}* -%dir %{datadir}/%{name}/ -%dir %{datadir}/%{name}/glade/ -%{datadir}/%{name}/glade/*.glade -%{datadir}/applications/%{name}.desktop -%{datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_bindir}/%{name} +%{_prefix}/lib/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/48x48/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/%{name} %{py_sitedir}/%{name}/xlib.so %{py_sitedir}/%{name}/aboutdialog.py* %{py_sitedir}/%{name}/changeswindow.py* @@ -230,6 +216,8 @@ %{py_sitedir}/%{name}/lockdown %changelog -n sabayon +* Tue Jan 23 2007 - sbrabec@suse.cz +- Spec file cleanup. * Tue Jan 23 2007 - aj@suse.de - Move to /usr. - Cleanup BuildRequires. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org