forked from pool/xdg-utils
Accepting request 356708 from X11:common:Factory
1 OBS-URL: https://build.opensuse.org/request/show/356708 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdg-utils?expand=0&rev=41
This commit is contained in:
commit
47fe091970
51
xdg-terminal-fix-terminal--x-arg.patch
Normal file
51
xdg-terminal-fix-terminal--x-arg.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
--- 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
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:db7917db9fc6a2d5419ffe62126544aec85fc1248ec2b01e9a9942eb4e085ca2
|
|
||||||
size 268800
|
|
3
xdg-utils-20151219.tar.xz
Normal file
3
xdg-utils-20151219.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5428951007586943edc65308aee15c5b7888bae8939a164c69212b7d60425440
|
||||||
|
size 268204
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 22 12:34:23 UTC 2016 - sor.alexei@meowr.ru
|
||||||
|
|
||||||
|
- 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.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Dec 6 10:23:11 UTC 2015 - jslaby@suse.com
|
Sun Dec 6 10:23:11 UTC 2015 - jslaby@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xdg-utils
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,64 +17,70 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: xdg-utils
|
Name: xdg-utils
|
||||||
BuildRequires: make
|
Version: 20151219
|
||||||
BuildRequires: xmlto
|
Release: 0
|
||||||
BuildRequires: xz
|
|
||||||
# for xmlto to be able to generate text from html
|
|
||||||
BuildRequires: w3m
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
Summary: Utilities to uniformly interface desktop environments
|
Summary: Utilities to uniformly interface desktop environments
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System/GUI/Other
|
Group: System/GUI/Other
|
||||||
Version: 20151112
|
|
||||||
Release: 0
|
|
||||||
BuildArch: noarch
|
|
||||||
Url: http://portland.freedesktop.org/
|
Url: http://portland.freedesktop.org/
|
||||||
# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz
|
# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tar.gz
|
||||||
Source0: xdg-utils-%{version}.tar.xz
|
Source: xdg-utils-%{version}.tar.xz
|
||||||
|
# PATCH-FEATURE-OPENSUSE install-some-more-scripts.diff jslaby@suse.cz
|
||||||
Patch0: install-some-more-scripts.diff
|
Patch0: install-some-more-scripts.diff
|
||||||
|
# PATCH-FIX-UPSTREAM xdg-terminal-fix-gsettings.patch fdo#93231 ronisbr@gmail.com
|
||||||
Patch1: xdg-terminal-fix-gsettings.patch
|
Patch1: xdg-terminal-fix-gsettings.patch
|
||||||
|
# PATCH-FIX-UPSTREAM fix-enlightenment-support.patch fdo#88280 simon@simotek.net
|
||||||
Patch2: fix-enlightenment-support.patch
|
Patch2: fix-enlightenment-support.patch
|
||||||
|
# PATCH-FIX-UPSTREAM xdg-terminal-fix-terminal--x-arg.patch fdo#93231 sor.alexei@meowr.ru -- 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
|
||||||
Requires: perl-Net-DBus
|
Requires: perl-Net-DBus
|
||||||
Requires: perl-X11-Protocol
|
Requires: perl-X11-Protocol
|
||||||
Requires: which
|
Requires: which
|
||||||
|
%if 0%{?suse_version} <= 1110
|
||||||
|
BuildRequires: xz
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
BuildArch: noarch
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The xdg-utils package is a set of simple scripts that provide basic desktop
|
The xdg-utils package is a set of simple scripts that provide basic
|
||||||
integration functions for any Free Desktop, such as Linux.
|
desktop integration functions for any Free Desktop, such as Linux.
|
||||||
|
|
||||||
They are intended to provide a set of defacto standards. This means that:
|
They are intended to provide a set of de-facto standards.
|
||||||
* Third party software developers can rely on these xdg-utils for all of their
|
This means that:
|
||||||
simple integration needs.
|
* 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
|
* Developers of desktop environments can make sure that their
|
||||||
well supported
|
environments are well supported.
|
||||||
|
|
||||||
If a desktop developer wants to be certain that their environment functions
|
If a desktop developer wants to be certain that their
|
||||||
with all third party software, then can simply make sure that these
|
environment functions with all third party software, then can
|
||||||
utilities work properly in their environment.
|
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.
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %name-%{version}
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
%patch3 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%makeinstall
|
%make_install
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc LICENSE README TODO ChangeLog
|
%doc ChangeLog LICENSE README TODO
|
||||||
%{_bindir}/xdg-desktop-icon
|
%{_bindir}/xdg-desktop-icon
|
||||||
%{_bindir}/xdg-desktop-menu
|
%{_bindir}/xdg-desktop-menu
|
||||||
%{_bindir}/xdg-email
|
%{_bindir}/xdg-email
|
||||||
@ -85,15 +91,15 @@ make %{?_smp_mflags}
|
|||||||
%{_bindir}/xdg-screensaver
|
%{_bindir}/xdg-screensaver
|
||||||
%{_bindir}/xdg-settings
|
%{_bindir}/xdg-settings
|
||||||
%{_bindir}/xdg-terminal
|
%{_bindir}/xdg-terminal
|
||||||
%{_mandir}/man1/xdg-desktop-icon.1*
|
%{_mandir}/man1/xdg-desktop-icon.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-desktop-menu.1*
|
%{_mandir}/man1/xdg-desktop-menu.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-email.1*
|
%{_mandir}/man1/xdg-email.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-icon-resource.1*
|
%{_mandir}/man1/xdg-icon-resource.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-mime.1*
|
%{_mandir}/man1/xdg-mime.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-open.1*
|
%{_mandir}/man1/xdg-open.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-terminal.1*
|
%{_mandir}/man1/xdg-terminal.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-screensaver.1*
|
%{_mandir}/man1/xdg-screensaver.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-settings.1*
|
%{_mandir}/man1/xdg-settings.1%{?ext_man}
|
||||||
%{_mandir}/man1/xdg-su.1*
|
%{_mandir}/man1/xdg-su.1%{?ext_man}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user