Hello community, here is the log from the commit of package xfce-utils for openSUSE:Factory checked in at 2012-04-18 16:29:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce-utils (Old) and /work/SRC/openSUSE:Factory/.xfce-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce-utils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce-utils/xfce-utils.changes 2011-10-28 15:29:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce-utils.new/xfce-utils.changes 2012-04-18 16:30:07.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Apr 4 15:41:11 UTC 2012 - [email protected] + +- correct dependencies + +------------------------------------------------------------------- +Sat Mar 31 18:12:27 UTC 2012 - [email protected] + +- own %{_sysconfdir}/xdg/xfce4 + +------------------------------------------------------------------- +Tue Mar 27 23:37:28 UTC 2012 - [email protected] + +- added xfce-utils-fix-xfterm4-arg-handling.patch in order to fix + xfterm4 commandline argument handling +- added xfce-utils-xfmountdev4-use-thunar.patch in order to use + thunar instead xftree4 in xfmountdev4 +- correct dependencies + +------------------------------------------------------------------- New: ---- xfce-utils-fix-xfterm4-arg-handling.patch xfce-utils-xfmountdev4-use-thunar.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce-utils.spec ++++++ --- /var/tmp/diff_new_pack.nefiYb/_old 2012-04-18 16:30:09.000000000 +0200 +++ /var/tmp/diff_new_pack.nefiYb/_new 2012-04-18 16:30:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xfce-utils # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,27 +16,33 @@ # - Name: xfce-utils Version: 4.8.3 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Collection of Scripts and Utilities for the Xfce Desktop Environment -Url: http://www.xfce.org/projects/xfce-utils/ +License: GPL-2.0+ Group: System/GUI/XFCE -Source: xfce-utils-%{version}.tar.bz2 +Url: http://www.xfce.org/ +Source: http://archive.xfce.org/src/xfce/xfce-utils/4.8/xfce-utils-%{version}.tar.bz2 Source1: xflock4.sh Source100: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM xfce-utils-4.8.3-fix-xfhelp4-invocation.patch [email protected] -- Fix the invocation of xfhelp4 with a HTML file commonly used by Xfce components Patch0: xfce-utils-4.8.3-fix-xfhelp4-invocation.patch # PATCH-FIX-OPENSUSE xfce-utils-adapt-session-script.patch [email protected] -- Adapt upstream sessions script to openSUSE Patch1: xfce-utils-adapt-session-script.patch +# PATCH-FIX-OPENSUSE xfce-utils-fix-xfterm4-arg-handling.patch [email protected] -- Fix xfterm4 commandline argument handling +Patch2: xfce-utils-fix-xfterm4-arg-handling.patch +# PATCH-FIX-OPENSUSE xfce-utils-xfmountdev4-use-thunar.patch [email protected] -- Use thunar instead xftree4 in xfmountdev4 +Patch3: xfce-utils-xfmountdev4-use-thunar.patch BuildRequires: fdupes BuildRequires: intltool +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libxfce4ui-1) BuildRequires: pkgconfig(libxfce4util-1.0) -BuildRequires: update-desktop-files +Requires: perl +Requires: perl(XML::Parser) BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} Recommends: %{name}-doc = %{version} @@ -48,26 +54,21 @@ menu. %package doc -License: GPL-2.0+ 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 %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %configure \ @@ -79,21 +80,24 @@ %install %make_install install -p -m 755 %{SOURCE1} %{buildroot}%{_bindir}/xflock4 + %suse_update_desktop_file xfce4-about -r X-XFCE X-Xfce-Toplevel %suse_update_desktop_file xfrun4 -r X-XFCE X-Xfce-Toplevel %suse_update_desktop_file xfhelp4 -r X-XFCE X-Xfce-Toplevel %suse_update_desktop_file xfconf-migration-4.6 -chmod +x %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc + +chmod 755 %{buildroot}%{_sysconfdir}/xdg/xfce4/xinitrc + rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang xfce-utils + +%find_lang xfce-utils %{?no_lang_C} + # temporarily disabled due to bnc#705989 -#%%fdupes %{buildroot}%{_datadir} +#%%fdupes %%{buildroot}%%{_datadir} %clean rm -rf %{buildroot} -%if 0%{?suse_version} >= 1140 - %post %desktop_database_post %icon_theme_cache_post @@ -101,7 +105,6 @@ %postun %desktop_database_postun %icon_theme_cache_postun -%endif %files %defattr(-,root,root) @@ -121,9 +124,10 @@ %{_datadir}/dbus-1/services/org.xfce.RunDialog.service %{_datadir}/icons/hicolor/48x48/apps/xfce4-logo.png %{_datadir}/xsessions/xfce.desktop +%dir %{_sysconfdir}/xdg/xfce4 +%{_sysconfdir}/xdg/xfce4/xinitrc %config %{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop %config %{_sysconfdir}/xdg/xfce4/Xft.xrdb -%{_sysconfdir}/xdg/xfce4/xinitrc %files doc %defattr(-,root,root) ++++++ xfce-utils-fix-xfterm4-arg-handling.patch ++++++ Index: xfce-utils-4.8.3/scripts/xfterm4 =================================================================== --- xfce-utils-4.8.3.orig/scripts/xfterm4 +++ xfce-utils-4.8.3/scripts/xfterm4 @@ -1,24 +1,15 @@ #!/bin/sh if [ "$1" = "-e" ]; then - if [ -n "$2" ]; then - shift - ESTRING="$@" - else - shift - fi + shift fi if [ -d "$*" ]; then cd "$*" -elif [ -x "$*" ]; then - cd `dirname "$*"` - ESTRING="`which pauseme`" - MSTRING="$*" -elif [ -f "$*" ]; then +elif [ -f "$*" -a ! -x "$*" ]; then ESTRING="`which less`" MSTRING="$*" -elif [ "`echo $* | grep "http:/"`" -o "`echo $* | grep "ftp:"`" ]; then +elif [ "`echo $* | grep "http:/"`" -o "`echo $* | grep "ftp:"`" -a ! -x "$*" ]; then # This requires lynx or links. If you don't have it, don't drop URLs. if which lynx >/dev/null 2>&1; then ESTRING="`which lynx`" @@ -26,6 +17,13 @@ elif [ "`echo $* | grep "http:/"`" -o "` ESTRING="`which links`" fi MSTRING="$*" +else + if which pauseme >/dev/null 2>&1; then + ESTRING="`which pauseme`" + MSTRING="$*" + else + ESTRING="$@" + fi fi if [ x"$ESTRING" = x"" ]; then ++++++ xfce-utils-xfmountdev4-use-thunar.patch ++++++ Index: xfce-utils-4.8.3/scripts/xfmountdev4 =================================================================== --- xfce-utils-4.8.3.orig/scripts/xfmountdev4 +++ xfce-utils-4.8.3/scripts/xfmountdev4 @@ -38,7 +38,7 @@ fi # seems clearer to me -- Jasper if [ "x$FILEMAN" = "x" ] then - FILEMAN=xftree4 + FILEMAN=thunar fi if [ "x$1" = "x" ]; then -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
