Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2014-12-03 22:52:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2014-09-28 19:58:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2014-12-03 22:52:21.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Nov 27 15:41:10 UTC 2014 - [email protected] + +- Update to 20141009: + * more of plasma5 +- xdg-mime-generic-do-not-return-more-than-one-default.patch (bnc#906625) +- .spec cleanup + +------------------------------------------------------------------- Old: ---- xdg-utils-20140922.tar.xz New: ---- xdg-mime-generic-do-not-return-more-than-one-default.patch xdg-utils-20141009.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.7ljbJ6/_old 2014-12-03 22:52:23.000000000 +0100 +++ /var/tmp/diff_new_pack.7ljbJ6/_new 2014-12-03 22:52:23.000000000 +0100 @@ -25,15 +25,15 @@ Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Version: 20140922 +Version: 20141009 Release: 0 BuildArch: noarch Url: http://portland.freedesktop.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build # http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz Source0: xdg-utils-%{version}.tar.xz Patch0: install-some-more-scripts.diff -Patch8: xdg-screensaver-gnome-perl.diff +Patch1: xdg-screensaver-gnome-perl.diff +Patch2: xdg-mime-generic-do-not-return-more-than-one-default.patch Requires: perl Requires: perl-Net-DBus Requires: perl-X11-Protocol @@ -57,18 +57,15 @@ %prep %setup -q -n %name-%{version} %patch0 -p1 -%patch8 -p1 +%patch1 -p1 +%patch2 -p1 %build %configure -(cd scripts; touch *.in; make %{?_smp_mflags} scripts) make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install - -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} +%makeinstall %files %defattr(-,root,root) ++++++ xdg-mime-generic-do-not-return-more-than-one-default.patch ++++++ >From ea7e2924df069a66423459c00e4e512063720fb1 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <[email protected]> Date: Thu, 27 Nov 2014 16:31:52 +0100 Subject: [PATCH 1/1] xdg-mime: generic, do not return more than one default References: bnc#906625 Now, 'xdg-mime query default' can return more than one application: $ XDG_UTILS_DEBUG_LEVEL=5 xdg-mime query default text/plain Checking /home/xslaby/.local/share//applications/mimeapps.list Checking /usr/share/applications/defaults.list and /usr/share/applications/mimeinfo.cache writer.desktop kde4-active-documentviewer_txt.desktop It is due to an unlimited grep in defapp_generic(). So limit the output by 'head -1'. Signed-off-by: Jiri Slaby <[email protected]> --- scripts/xdg-mime.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in index 0290d7742e45..da472edf267a 100644 --- a/scripts/xdg-mime.in +++ b/scripts/xdg-mime.in @@ -383,7 +383,7 @@ defapp_generic() for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do for prefix in "$XDG_MENU_PREFIX" ""; do DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache" - trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1` + trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | head -1 | cut -d '=' -f 2 | cut -d ';' -f 1` if [ -n "$trader_result" ] ; then echo $trader_result exit_success -- 2.1.3 ++++++ xdg-utils-20140922.tar.xz -> xdg-utils-20141009.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140922/ChangeLog new/xdg-utils-20141009/ChangeLog --- old/xdg-utils-20140922/ChangeLog 2014-09-23 18:34:19.000000000 +0200 +++ new/xdg-utils-20141009/ChangeLog 2014-11-27 16:37:05.000000000 +0100 @@ -1,5 +1,8 @@ === xdg-utils 1.1.x === +2014-10-09 Rex Dieter <[email protected]> + * xdg-screensaver plasma5 support + 2014-09-22 Rex Dieter <[email protected]> * Initial support for Plasma5 (largely thanks to Karol Herbst) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20140922/scripts/xdg-screensaver.in new/xdg-utils-20141009/scripts/xdg-screensaver.in --- old/xdg-utils-20140922/scripts/xdg-screensaver.in 2014-09-23 18:34:19.000000000 +0200 +++ new/xdg-utils-20141009/scripts/xdg-screensaver.in 2014-11-27 16:37:05.000000000 +0100 @@ -86,13 +86,12 @@ case "$DE" in kde) - if [ x"$KDE_SESSION_VERSION" = x"4" ]; then - screensaver_freedesktop "$1" + if [ -n "${KDE_SESSION_VERSION}" ]; then + screensaver_freedesktop "$1" else - screensaver_kde "$1" + screensaver_kde3 "$1" fi ;; - gnome_screensaver) screensaver_gnome_screensaver "$1" ;; @@ -314,7 +313,7 @@ esac } -screensaver_kde() +screensaver_kde3() { case "$1" in suspend) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
