From 59eb2bfd817e2033ba06541a977511b7bc0f03e76cb7bd2ed04ec3c7dad44be0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 9 Jan 2014 16:13:45 +0000 Subject: [PATCH] Accepting request 213327 from home:jirislaby:branches:X11:common:Factory update to 20140109 OBS-URL: https://build.opensuse.org/request/show/213327 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=31 --- ...-generic-handle-filenames-with-colon.patch | 31 ------------------- xdg-utils-20131024.tar.xz | 3 -- xdg-utils-20140109.tar.xz | 3 ++ xdg-utils.changes | 8 ++--- xdg-utils.spec | 4 +-- 5 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 xdg-mime-generic-handle-filenames-with-colon.patch delete mode 100644 xdg-utils-20131024.tar.xz create mode 100644 xdg-utils-20140109.tar.xz diff --git a/xdg-mime-generic-handle-filenames-with-colon.patch b/xdg-mime-generic-handle-filenames-with-colon.patch deleted file mode 100644 index 92d2ffc..0000000 --- a/xdg-mime-generic-handle-filenames-with-colon.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Jiri Slaby -Date: Thu, 9 Jan 2014 14:11:18 +0100 -Subject: xdg-mime: generic, handle filenames with colon -Patch-mainline: not yet, submitted on 9 Jan 2014 -References: bnc#854777 - -When we use the generic path, we use cut to separate filename from -mime type from the output of /usr/bin/file. Let's use -b parameter of -/usr/bin/file and eliminate cut and sed completely. - -Signed-off-by: Jiri Slaby ---- - 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 7669a3b93a9c..474dc5d4488e 100644 ---- a/scripts/xdg-mime.in -+++ b/scripts/xdg-mime.in -@@ -98,7 +98,7 @@ info_generic() - mimetype -b "$1" - else - DEBUG 1 "Running file --mime-type \"$1\"" -- /usr/bin/file --mime-type "$1" 2> /dev/null | cut -d ":" -f 2 | sed s/"^ "// -+ /usr/bin/file -b --mime-type "$1" 2> /dev/null - fi - - if [ $? -eq 0 ]; then --- -1.8.5.2 - diff --git a/xdg-utils-20131024.tar.xz b/xdg-utils-20131024.tar.xz deleted file mode 100644 index bcd5ca9..0000000 --- a/xdg-utils-20131024.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15db685c4e1f35fa9bba9b75194993c21c7f931c8daeb920d9ac1915452731b1 -size 273228 diff --git a/xdg-utils-20140109.tar.xz b/xdg-utils-20140109.tar.xz new file mode 100644 index 0000000..37c2e86 --- /dev/null +++ b/xdg-utils-20140109.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e0497f7a2659d7447c37f623e40fb0a844dd9559395560f861fad0604229de3 +size 266420 diff --git a/xdg-utils.changes b/xdg-utils.changes index 93b8233..84b61a2 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,12 +1,8 @@ -------------------------------------------------------------------- -Thu Jan 9 13:54:09 UTC 2014 - jslaby@suse.com - -- xdg-mime-generic-handle-filenames-with-colon.patch (bnc#854777) - ------------------------------------------------------------------- Thu Jan 9 13:51:11 UTC 2014 - jslaby@suse.com -- update to 20131024 +- update to 20140109 + * xdg-mime: generic, handle filenames with colon (bnc#854777) * xdg-desktop-menu: improperly check for vendor prefix ... * xdg-screensaver: Support MATE desktop part 2 * xdg-desktop-menu: Unquoted file name (BR69399) diff --git a/xdg-utils.spec b/xdg-utils.spec index e725423..ee3d1ad 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -26,7 +26,7 @@ BuildRequires: w3m Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Version: 20131024 +Version: 20140109 Release: 0 BuildArch: noarch Url: http://portland.freedesktop.org/ @@ -34,7 +34,6 @@ 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 -Patch1: xdg-mime-generic-handle-filenames-with-colon.patch Patch8: xdg-screensaver-gnome-perl.diff Requires: perl Requires: perl-Net-DBus @@ -59,7 +58,6 @@ these utilities work properly in their environment. %prep %setup -q -n %name-%{version} %patch0 -p1 -%patch1 -p1 %patch8 -p1 %build