Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2016-02-05 00:30:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-12-13 09:37:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2016-02-05 00:30:27.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Jan 22 12:34:23 UTC 2016 - [email protected] + +- Update to 20151219: + * xdg-open: Improve fallbacks, add open_generic (almost) + everywhere (fdo#93442). + * xdg-open: Standardise output redirection style. +- Add xdg-terminal-fix-terminal--x-arg.patch: fix for "-x" usage + (default option for MATE and GNOME terminals). +- Spec cleanup. + +------------------------------------------------------------------- Old: ---- xdg-utils-20151112.tar.xz New: ---- xdg-terminal-fix-terminal--x-arg.patch xdg-utils-20151219.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.HjyGUg/_old 2016-02-05 00:30:28.000000000 +0100 +++ /var/tmp/diff_new_pack.HjyGUg/_new 2016-02-05 00:30:28.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xdg-utils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,64 +17,70 @@ Name: xdg-utils -BuildRequires: make -BuildRequires: xmlto -BuildRequires: xz -# for xmlto to be able to generate text from html -BuildRequires: w3m -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Version: 20151219 +Release: 0 Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Version: 20151112 -Release: 0 -BuildArch: noarch Url: http://portland.freedesktop.org/ -# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz -Source0: xdg-utils-%{version}.tar.xz +# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tar.gz +Source: xdg-utils-%{version}.tar.xz +# PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff [email protected] Patch0: install-some-more-scripts.diff +# PATCH-FIX-UPSTREAM xdg-terminal-fix-gsettings.patch fdo#93231 [email protected] Patch1: xdg-terminal-fix-gsettings.patch +# PATCH-FIX-UPSTREAM fix-enlightenment-support.patch fdo#88280 [email protected] Patch2: fix-enlightenment-support.patch +# PATCH-FIX-UPSTREAM xdg-terminal-fix-terminal--x-arg.patch fdo#93231 [email protected] -- https://bugs.freedesktop.org/show_bug.cgi?id=93231#c5 +Patch3: xdg-terminal-fix-terminal--x-arg.patch +BuildRequires: make +# for xmlto to be able to generate text from html +BuildRequires: w3m +BuildRequires: xmlto Requires: perl Requires: perl-Net-DBus Requires: perl-X11-Protocol Requires: which +%if 0%{?suse_version} <= 1110 +BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch +%endif %description -The xdg-utils package is a set of simple scripts that provide basic desktop -integration functions for any Free Desktop, such as Linux. +The xdg-utils package is a set of simple scripts that provide basic +desktop integration functions for any Free Desktop, such as Linux. -They are intended to provide a set of defacto standards. This means that: -* Third party software developers can rely on these xdg-utils for all of their - simple integration needs. - -* Developers of desktop environments can make sure that their environments are - well supported - - If a desktop developer wants to be certain that their environment functions - with all third party software, then can simply make sure that these - utilities work properly in their environment. - - This will hopefully mean that 'third tier' window managers such as XFCE and - Blackbox can reach full parity with Gnome and KDE in terms of third party - ISV support. +They are intended to provide a set of de-facto standards. +This means that: + * Third party software developers can rely on these xdg-utils for + all of their simple integration needs. + +* Developers of desktop environments can make sure that their + environments are well supported. + + If a desktop developer wants to be certain that their + environment functions with all third party software, then can + simply make sure that these utilities work properly in their + environment. %prep -%setup -q -n %name-%{version} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure make %{?_smp_mflags} %install -%makeinstall +%make_install %files %defattr(-,root,root) -%doc LICENSE README TODO ChangeLog +%doc ChangeLog LICENSE README TODO %{_bindir}/xdg-desktop-icon %{_bindir}/xdg-desktop-menu %{_bindir}/xdg-email @@ -85,15 +91,15 @@ %{_bindir}/xdg-screensaver %{_bindir}/xdg-settings %{_bindir}/xdg-terminal -%{_mandir}/man1/xdg-desktop-icon.1* -%{_mandir}/man1/xdg-desktop-menu.1* -%{_mandir}/man1/xdg-email.1* -%{_mandir}/man1/xdg-icon-resource.1* -%{_mandir}/man1/xdg-mime.1* -%{_mandir}/man1/xdg-open.1* -%{_mandir}/man1/xdg-terminal.1* -%{_mandir}/man1/xdg-screensaver.1* -%{_mandir}/man1/xdg-settings.1* -%{_mandir}/man1/xdg-su.1* +%{_mandir}/man1/xdg-desktop-icon.1%{?ext_man} +%{_mandir}/man1/xdg-desktop-menu.1%{?ext_man} +%{_mandir}/man1/xdg-email.1%{?ext_man} +%{_mandir}/man1/xdg-icon-resource.1%{?ext_man} +%{_mandir}/man1/xdg-mime.1%{?ext_man} +%{_mandir}/man1/xdg-open.1%{?ext_man} +%{_mandir}/man1/xdg-terminal.1%{?ext_man} +%{_mandir}/man1/xdg-screensaver.1%{?ext_man} +%{_mandir}/man1/xdg-settings.1%{?ext_man} +%{_mandir}/man1/xdg-su.1%{?ext_man} %changelog ++++++ xdg-terminal-fix-terminal--x-arg.patch ++++++ --- a/scripts/xdg-terminal.in +++ b/scripts/xdg-terminal.in @@ -65,11 +65,17 @@ terminal_gnome() if [ x"$1" = x"" ]; then $terminal_exec else - if [ x"$term_exec_arg" = x"" ]; then - $terminal_exec "$1" - else - $terminal_exec "$term_exec_arg" "$1" - fi + case "$term_exec_arg" in + "") + "$terminal_exec" "$1" + ;; + *-x*) + "$terminal_exec" "$term_exec_arg" sh -c "$1" + ;; + *) + "$terminal_exec" "$term_exec_arg" "$1" + ;; + esac fi if [ $? -eq 0 ]; then @@ -93,13 +99,19 @@ terminal_gsettings() if [ -x "$terminal_exec" ]; then if [ x"$1" = x"" ]; then - $terminal_exec + "$terminal_exec" else - if [ x"$term_exec_arg" = x"" ]; then - $terminal_exec "$1" - else - $terminal_exec "$term_exec_arg" "$1" - fi + case "$term_exec_arg" in + "") + "$terminal_exec" "$1" + ;; + *-x*) + "$terminal_exec" "$term_exec_arg" sh -c "$1" + ;; + *) + "$terminal_exec" "$term_exec_arg" "$1" + ;; + esac fi if [ $? -eq 0 ]; then ++++++ xdg-utils-20151112.tar.xz -> xdg-utils-20151219.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151112/ChangeLog new/xdg-utils-20151219/ChangeLog --- old/xdg-utils-20151112/ChangeLog 2015-12-06 11:19:52.000000000 +0100 +++ new/xdg-utils-20151219/ChangeLog 2016-01-22 15:12:24.000000000 +0100 @@ -1,5 +1,8 @@ === xdg-utils 1.1.2 (unreleased) === +2015-12-19 Rex Dieter <[email protected]> + * xdg-open: improve fallbacks, add open_generic (almost) everywhere (BR93442) + 2015-11-03 Per Olofsson <[email protected]> * Check for $WAYLAND_DISPLAY as well as $DISPLAY. Move display checking to a common has_display() function. Thanks to Pasi Sjöholm for reporting. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20151112/scripts/xdg-open.in new/xdg-utils-20151219/scripts/xdg-open.in --- old/xdg-utils-20151112/scripts/xdg-open.in 2015-12-06 11:19:52.000000000 +0100 +++ new/xdg-utils-20151219/scripts/xdg-open.in 2016-01-22 15:12:24.000000000 +0100 @@ -144,7 +144,7 @@ open_gnome3() { - if gvfs-open --help >/dev/null 2>&1; then + if gvfs-open --help 2>/dev/null 1>&2; then gvfs-open "$1" else open_generic "$1" @@ -159,9 +159,9 @@ open_gnome() { - if gvfs-open --help >/dev/null 2>&1; then + if gvfs-open --help 2>/dev/null 1>&2; then gvfs-open "$1" - elif gnome-open --help >/dev/null 2>&1; then + elif gnome-open --help 2>/dev/null 1>&2; then gnome-open "$1" else open_generic "$1" @@ -178,8 +178,10 @@ { if gvfs-open --help 2>/dev/null 1>&2; then gvfs-open "$1" - else + elif mate-open --help 2>/dev/null 1>&2; then mate-open "$1" + else + open_generic "$1" fi if [ $? -eq 0 ]; then @@ -191,7 +193,13 @@ open_xfce() { - exo-open "$1" + if exo-open --help 2>/dev/null 1>&2; then + exo-open "$1" + elif gvfs-open --help 2>/dev/null 1>&2; then + gvfs-open "$1" + else + open_generic "$1" + fi if [ $? -eq 0 ]; then exit_success @@ -202,7 +210,11 @@ open_enlightenment() { - enlightenment_open "$1" + if enlightenment_open --help 2>/dev/null 1>&2; then + enlightenment_open "$1" + else + open_generic "$1" + fi if [ $? -eq 0 ]; then exit_success
