Hello community, here is the log from the commit of package xfce-utils for openSUSE:Factory checked in at Fri Jan 14 17:28:27 CET 2011. -------- --- xfce-utils/xfce-utils.changes 2010-12-15 17:01:25.000000000 +0100 +++ xfce-utils/xfce-utils.changes 2011-01-14 14:58:40.000000000 +0100 @@ -1,0 +2,16 @@ +Fri Jan 14 14:02:18 UTC 2011 - gber@opensuse.org + +- do not require but recommend -lang subpackage + +------------------------------------------------------------------- +Mon Dec 27 20:56:40 UTC 2010 - gber@opensuse.org + +- use %%suse_update_desktop_file for all desktop files +- do not install documentation in /usr/shar/doc +- remove unsupported locales +- split off -lang subpackage +- split of -doc subpackage +- updated xflock4.sh to latest version from + http://bugzilla.xfce.org/show_bug.cgi?id=3770 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce-utils.spec ++++++ --- /var/tmp/diff_new_pack.eqQPvH/_old 2011-01-14 17:26:26.000000000 +0100 +++ /var/tmp/diff_new_pack.eqQPvH/_new 2011-01-14 17:26:26.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xfce-utils (Version 4.7.3) +# spec file for package xfce-utils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,10 +19,10 @@ Name: xfce-utils Version: 4.7.3 -Release: 1 +Release: 2 License: GPLv2+ -Summary: Xfce utils -Url: http://xfce.org +Summary: Collection of scripts and utilities for the Xfce desktop environment +Url: http://www.xfce.org/projects/xfce-utils/ Group: System/GUI/XFCE Source: xfce-utils-%{version}.tar.bz2 Source1: xflock4.sh @@ -33,33 +33,58 @@ BuildRequires: pkgconfig(libxfce4util-1.0) BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang = %{version} +Recommends: %{name}-doc = %{version} %description -A set of utilities for Xfce +This is a collection of scripts and utilities for the Xfce desktop environment, +including an about dialog, an application launcher, and several useful scripts +that are also used by other Xfce components such as the panel and the desktop +menu. +%package doc +License: GPLv2+ +Summary: Documentation for xfce-utils +Group: Documentation/HTML +BuildArch: noarch +Requires: %{name} = %{version} + +%description doc +This is a collection of scripts and utilities for the Xfce desktop environment, +including an about dialog, an application launcher, and several useful scripts +that are also used by other Xfce components such as the panel and the desktop +menu. + +This package provides the documentation for xfce-utils. + + +%lang_package %prep %setup -q -n xfce-utils-%{version} %build -%configure +%configure --docdir=%{_defaultdocdir}/%{name} make V=1 %{?_smp_mflags} %install %make_install +install -p -m 644 ChangeLog README COPYING \ + %{buildroot}%{_defaultdocdir}/%{name} install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/xflock4 %suse_update_desktop_file xfce4-about %suse_update_desktop_file xfrun4 %suse_update_desktop_file xfhelp4 +%suse_update_desktop_file xfconf-migration-4.6 chmod +x %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc +rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} %find_lang xfce-utils %fdupes %{buildroot}%{_datadir} %clean rm -rf %{buildroot} -%files -f xfce-utils.lang +%files %defattr(-,root,root) -%doc ChangeLog README COPYING %{_bindir}/startxfce4 %{_bindir}/xfbrowser4 %{_bindir}/xfce4-about @@ -74,11 +99,16 @@ %{_libdir}/xfce4/xfconf-migration/xfconf-migration-4.6.pl %{_datadir}/applications/*.desktop %{_datadir}/dbus-1/services/org.xfce.RunDialog.service -%{_datadir}/doc/xfce-utils %{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png %{_datadir}/xsessions/xfce.desktop -%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop -%{_sysconfdir}/xdg/xfce4/Xft.xrdb +%config %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop +%config %{_sysconfdir}/xdg/xfce4/Xft.xrdb %{_sysconfdir}/xdg/xfce4/xinitrc +%files doc +%defattr(-,root,root) +%doc %{_defaultdocdir}/%{name} + +%files lang -f %{name}.lang + %changelog ++++++ xflock4.sh ++++++ --- /var/tmp/diff_new_pack.eqQPvH/_old 2011-01-14 17:26:26.000000000 +0100 +++ /var/tmp/diff_new_pack.eqQPvH/_new 2011-01-14 17:26:26.000000000 +0100 @@ -21,10 +21,20 @@ for lock_cmd in \ "xscreensaver-command -lock" \ - "gnome-screensaver-command --lock" \ + "gnome-screensaver-command --lock" +do + $lock_cmd >/dev/null 2>&1 && exit +done + +for lock_cmd in \ "slock" \ "xlock -mode blank" do - $lock_cmd >/dev/null 2>&1 && break + set -- $lock_cmd + if command -v -- $1 >/dev/null 2>&1; then + $lock_cmd >/dev/null 2>&1 & + exit + fi done -exit 0 + +exit 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org