rpms/xdg-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

xdg-utils-1.1.0-rc3

Browse Source
This commit is contained in:
Rex Dieter 2015-01-03 11:16:58 -06:00
parent df8c77b7c4
commit f80509adb1
29 changed files with 8 additions and 4241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
/xdg-utils-1.1.0-rc2.tar.gz /xdg-utils-1.1.0-rc2.tar.gz
/xdg-utils-1.1.0-rc3.tar.gz

27
0001-mention-xdg-settings.patch
View File

@ -1,27 +0,0 @@
From a983a14293129ea94b634579a46dc69835e88e15 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 7 Feb 2014 10:31:08 -0600
Subject: [PATCH 01/22] mention xdg-settings
gleaned from 1.1.0-rc1 release announcement
---
RELEASE_NOTES | 3 +++
1 file changed, 3 insertions(+)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 7f84063..484b2b9 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -4,6 +4,9 @@ Release notes for xdg-utils 1.1.0
This release includes:
* better support for GNOME3, KDE4, LXDE, MATE, XFCE
* initial support for generic methods (non toolkit-specific, experimental)
+* xdg-settings utility, a script to get various settings from the desktop
+ environment
+
Release notes for xdg-utils 1.0.2
=================================
--
2.1.0

39
0002-Improvement-of-detecting-KDE-session-BR63157.patch
View File

@ -1,39 +0,0 @@
From cba39e7a00abe27b3bff49e2d455bb30ad33dde6 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 7 Feb 2014 10:51:10 -0600
Subject: [PATCH 02/22] Improvement of detecting KDE session (BR63157)
---
ChangeLog | 3 +++
scripts/xdg-utils-common.in | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8b35df0..b7fcf86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.x ===
+2014-02-07 Rex Dieter <rdieter@fedoraproject.org>
+ * Improvement of detecting KDE session (BR63157)
+
2013-10-24 Rex Dieter <rdieter@fedoraproject.org>
* xdg-desktop-menu: improperly check for vendor prefix on Estonian locale (BR70742)
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
index 5b50f9b..c365cca 100644
--- a/scripts/xdg-utils-common.in
+++ b/scripts/xdg-utils-common.in
@@ -279,7 +279,7 @@ detectDE()
if [ x"$DE" = x"" ]; then
# classic fallbacks
- if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
+ if [ x"$KDE_FULL_SESSION" != x"" ]; then DE=kde;
elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
elif [ x"$MATE_DESKTOP_SESSION_ID" != x"" ]; then DE=mate;
elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
--
2.1.0

55
0003-xdg-terminal-incompatible-.-BR44357.patch
View File

@ -1,55 +0,0 @@
From 495fa68306f6f5b0c0bb312e92f0f2a0e35fa567 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 7 Feb 2014 10:56:17 -0600
Subject: [PATCH 03/22] xdg-terminal incompatible ... (BR44357)
fix harder! put the code in the right place this time.
---
scripts/xdg-terminal.in | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in
index 614dacf..21d8309 100644
--- a/scripts/xdg-terminal.in
+++ b/scripts/xdg-terminal.in
@@ -38,17 +38,7 @@ terminal_kde()
if [ x"$1" = x"" ]; then
$terminal_exec
else
- # screen and urxvt won't do their own parsing of quoted arguments
- if [ x"$TERM" = x"screen" ]; then
- # screen has an incompatible meaning for -e
- sh -c "exec $terminal_exec $1"
- elif [ x"$TERM" = x"urxvt" ] || [ x"$TERM" = x"rxvt-unicode" ] || [ x"$TERM" = x"rxvt" ]; then
- #TODO: Use whatever mechanism dash supports to test for
- # rxvt-* to match things like rxvt-unicode-256color
- sh -c "exec $terminal_exec -e $1"
- else
- $terminal_exec -e "$1"
- fi
+ $terminal_exec -e "$1"
fi
if [ $? -eq 0 ]; then
@@ -120,7 +110,17 @@ terminal_generic()
if [ x"$1" = x"" ]; then
$terminal_exec
else
- $terminal_exec -e "$1"
+ # screen and urxvt won't do their own parsing of quoted arguments
+ if [ x"$TERM" = x"screen" ]; then
+ # screen has an incompatible meaning for -e
+ sh -c "exec $terminal_exec $1"
+ elif [ x"$TERM" = x"urxvt" ] || [ x"$TERM" = x"rxvt-unicode" ] || [ x"$TERM" = x"rxvt" ]; then
+ #TODO: Use whatever mechanism dash supports to test for
+ # rxvt-* to match things like rxvt-unicode-256color
+ sh -c "exec $terminal_exec -e $1"
+ else
+ $terminal_exec -e "$1"
+ fi
fi
if [ $? -eq 0 ]; then
--
2.1.0

1107
0004-remove-generated-html-files.patch
View File

File diff suppressed because it is too large Load Diff

1939
0005-remove-generated-man-pages.patch
View File

File diff suppressed because it is too large Load Diff

25
0006-all-re-generate-html-man-too.patch
View File

@ -1,25 +0,0 @@
From 6da906f59933133612d006e1bff9918a2b8c5a60 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 7 Feb 2014 12:31:40 -0600
Subject: [PATCH 06/22] all: (re)generate html/man too
---
scripts/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index f93dfd6..9a772bc 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -30,7 +30,7 @@ MANPAGES= $(SCRIPTS:%=man/%.1)
WEBPAGES= $(SCRIPTS:%=%.html)
XMLFILES= $(SCRIPTS:%=desc/%.xml)
-all: scripts
+all: html man scripts
html: index.html $(WEBPAGES)
--
2.1.0

70
0007-drop-references-to-Value-1.0-key-BR74688.patch
View File

@ -1,70 +0,0 @@
From 50254545a0d2c181bf9bce4c7723044ee7186cb5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 8 Feb 2014 12:39:43 -0600
Subject: [PATCH 07/22] drop references to Value=1.0 key (BR74688)
Can't find this decomented anywhere in current fdo specs.
---
scripts/desc/xdg-desktop-icon.xml | 9 ---------
scripts/desc/xdg-desktop-menu.xml | 18 ------------------
2 files changed, 27 deletions(-)
diff --git a/scripts/desc/xdg-desktop-icon.xml b/scripts/desc/xdg-desktop-icon.xml
index a886d5c..273045d 100644
--- a/scripts/desc/xdg-desktop-icon.xml
+++ b/scripts/desc/xdg-desktop-icon.xml
@@ -164,15 +164,6 @@
The following keys are often used:
</para>
<variablelist>
- <varlistentry>
- <term>Value=1.0</term>
- <listitem>
- <simpara>
- This is a mandatory field to indicate that the *.desktop file
- follows the 1.0 version of the specification.
- </simpara>
- </listitem>
- </varlistentry>
<varlistentry>
<term>Type=Application</term>
diff --git a/scripts/desc/xdg-desktop-menu.xml b/scripts/desc/xdg-desktop-menu.xml
index e7bda35..e3bab7c 100644
--- a/scripts/desc/xdg-desktop-menu.xml
+++ b/scripts/desc/xdg-desktop-menu.xml
@@ -262,15 +262,6 @@
The following keys are often used:
</para>
<variablelist>
- <varlistentry>
- <term>Value=1.0</term>
- <listitem>
- <simpara>
- This is a mandatory field to indicate that the *.desktop file
- follows the 1.0 version of the specification.
- </simpara>
- </listitem>
- </varlistentry>
<varlistentry>
<term>Type=Application</term>
@@ -406,15 +397,6 @@
The following keys are relevant for submenus:
</para>
<variablelist>
- <varlistentry>
- <term>Value=1.0</term>
- <listitem>
- <simpara>
- This is a mandatory field to indicate that the *.directory file
- follows the 1.0 version of the Desktop Entry specification.
- </simpara>
- </listitem>
- </varlistentry>
<varlistentry>
<term>Type=Directory</term>
--
2.1.0

29
0008-xdg-open-Remove-first_word-already-in-common.patch
View File

@ -1,29 +0,0 @@
From 3eaf93ab3303e14813885b6b743b48a1c3b5a6ab Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Wed, 26 Feb 2014 15:19:33 +0100
Subject: [PATCH 08/22] xdg-open: Remove first_word, already in common
---
scripts/xdg-open.in | 6 ------
1 file changed, 6 deletions(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 87e161d..1f768d8 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -30,12 +30,6 @@ _USAGE
#@xdg-utils-common@
# This handles backslashes but not quote marks.
-first_word()
-{
- read first rest
- echo "$first"
-}
-
last_word()
{
read first rest
--
2.1.0

61
0009-xdg-open-Expand-i-and-c-from-Exec.patch
View File

@ -1,61 +0,0 @@
From 316b9adc05c6d871360afb1195939c5fc975ccff Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Wed, 26 Feb 2014 15:26:59 +0100
Subject: [PATCH 09/22] xdg-open: Expand %i and %c from Exec
---
scripts/xdg-open.in | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 1f768d8..e7a15a9 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -36,6 +36,17 @@ last_word()
echo "$rest"
}
+# Get the value of a key in a .desktop file.
+# Example: Use get_key foo.desktop Exec
+# to get the values of the Exec= key
+get_key()
+{
+ local file="${1}"
+ local key="${2}"
+
+ grep -E "^${key}=" "${file}" | cut -d= -f 2-
+}
+
open_darwin()
{
open "$1"
@@ -137,11 +148,23 @@ search_desktop_file()
fi
if [ -r "$file" ] ; then
- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`"
+ command="$(get_key "${file}" "Exec" | first_word)"
command_exec=`which $command 2>/dev/null`
- arguments="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | last_word`"
+ arguments="$(get_key "${file}" "Exec" | last_word)"
arg_one="`echo "$arg" | sed 's/[&*\\]/\\\\&/g'`"
- arguments_exec="`echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g'`"
+ icon="$(get_key "${file}" "Icon")"
+ if [ "${icon}" != "" ]
+ then
+ icon="--icon '${icon}'"
+ else
+ icon="''"
+ fi
+ # FIXME: Actually LC_MESSAGES should be used as described in
+ # http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s04.html
+ localised_name="'$(get_key "${file}" "Name")'"
+ arguments_exec="$(echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g' \
+ -e 's*%i*'"$icon"'*g' \
+ -e 's*%c*'"$localised_name"'*g')"
if [ -x "$command_exec" ] ; then
if echo "$arguments" | grep -iq '%[fFuU]' ; then
--
2.1.0

59
0010-xdg-open-Support-multiple-groups.patch
View File

@ -1,59 +0,0 @@
From ba265f969b9061d221915c2528122c44a85ad7c2 Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Fri, 11 Apr 2014 18:35:34 +0200
Subject: [PATCH 10/22] xdg-open: Support multiple groups
Desktop files might contain multiple groups. Check for keys only in the
Desktop Entry group.
---
scripts/xdg-open.in | 29 +++++++++++++++++++++++++----
1 file changed, 25 insertions(+), 4 deletions(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index e7a15a9..b994fa5 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -36,15 +36,36 @@ last_word()
echo "$rest"
}
-# Get the value of a key in a .desktop file.
+# Get the value of a key in a desktop file's Desktop Entry group.
# Example: Use get_key foo.desktop Exec
-# to get the values of the Exec= key
+# to get the values of the Exec= key for the Desktop Entry group.
get_key()
{
local file="${1}"
local key="${2}"
-
- grep -E "^${key}=" "${file}" | cut -d= -f 2-
+ local desktop_entry=""
+
+ IFS_="${IFS}"
+ IFS=""
+ while read line
+ do
+ case "$line" in
+ "[Desktop Entry]")
+ desktop_entry="y"
+ ;;
+ # Reset match flag for other groups
+ [*)
+ desktop_entry=""
+ ;;
+ *)
+ # Only match Desktop Entry group
+ if [ -n "${desktop_entry}" ]
+ then
+ echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2-
+ fi
+ esac
+ done < "${file}"
+ IFS="${IFS_}"
}
open_darwin()
--
2.1.0

25
0011-followup-fix-for-prior-commit.patch
View File

@ -1,25 +0,0 @@
From 69adcfeb4679f75eb24f357f304715d3c014273b Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Tue, 15 Apr 2014 09:17:12 -0500
Subject: [PATCH 11/22] followup fix for prior commit
---
scripts/xdg-open.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index b994fa5..35f4b76 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -61,7 +61,7 @@ get_key()
# Only match Desktop Entry group
if [ -n "${desktop_entry}" ]
then
- echo "${line}" | grep -E "^${key}=" "${file}" | cut -d= -f 2-
+ echo "${line}" | grep -E "^${key}=" | cut -d= -f 2-
fi
esac
done < "${file}"
--
2.1.0

42
0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch
View File

@ -1,42 +0,0 @@
From 5913207e625a92b73cd9489aea4b7b10bf3eb855 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 26 Apr 2014 17:20:35 -0500
Subject: [PATCH 12/22] xdg-open fails to open web browser urls with a query
string (BR45857)
---
ChangeLog | 3 +++
scripts/xdg-open.in | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index b7fcf86..f29d9d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.x ===
+2014-04-26 Rex Dieter <rdieter@fedoraproject.org>
+ * xdg-open fails to open web browser urls with a query string (BR45857)
+
2014-02-07 Rex Dieter <rdieter@fedoraproject.org>
* Improvement of detecting KDE session (BR63157)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 35f4b76..917df2c 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -254,7 +254,9 @@ open_generic()
file=${file#file://}
file="$(printf "$(echo "$file" | sed -e 's@%\([a-f0-9A-F]\{2\}\)@\\x\1@g')")"
fi
- check_input_file "$file"
+ file_check=${file%%#*}
+ file_check=${file_check%%\?*}
+ check_input_file "$file_check"
open_generic_xdg_file_mime "$file"
--
2.1.0

38
0013-xdg-open-use-kde-open-noninteractive-BR16295.patch
View File

@ -1,38 +0,0 @@
From 869b22b75fc6e7c9e29ba5367bd97ebf7ce76cb3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 26 Apr 2014 17:28:50 -0500
Subject: [PATCH 13/22] xdg-open: use 'kde-open --noninteractive' (BR16295)
---
ChangeLog | 1 +
scripts/xdg-open.in | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index f29d9d6..cb7cf65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2014-04-26 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open fails to open web browser urls with a query string (BR45857)
+ * xdg-open: use 'kde-open --noninteractive' (BR16295)
2014-02-07 Rex Dieter <rdieter@fedoraproject.org>
* Improvement of detecting KDE session (BR63157)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 917df2c..637a762 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -82,7 +82,7 @@ open_darwin()
open_kde()
{
if kde-open -v 2>/dev/null 1>&2; then
- kde-open "$1"
+ kde-open --noninteractive "$1"
else
if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
kfmclient openURL "$1"
--
2.1.0

43
0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch
View File

@ -1,43 +0,0 @@
From 8369f878c08b435ecd5523b4c49eff36348c4bae Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 30 Jun 2014 07:54:50 -0500
Subject: [PATCH 14/22] Revert "xdg-open: use 'kde-open --noninteractive'
(BR16295)"
This reverts commit 869b22b75fc6e7c9e29ba5367bd97ebf7ce76cb3.
kde-open --noninteractive is still crashy :(
https://bugs.kde.org/show_bug.cgi?id=336117
---
ChangeLog | 1 -
scripts/xdg-open.in | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb7cf65..f29d9d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,6 @@
2014-04-26 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open fails to open web browser urls with a query string (BR45857)
- * xdg-open: use 'kde-open --noninteractive' (BR16295)
2014-02-07 Rex Dieter <rdieter@fedoraproject.org>
* Improvement of detecting KDE session (BR63157)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 637a762..917df2c 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -82,7 +82,7 @@ open_darwin()
open_kde()
{
if kde-open -v 2>/dev/null 1>&2; then
- kde-open --noninteractive "$1"
+ kde-open "$1"
else
if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
kfmclient openURL "$1"
--
2.1.0

31
0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch
View File

@ -1,31 +0,0 @@
From 34e033845ea6997bc4fdafd9bdd4856bfa5d0d36 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 30 Jun 2014 17:31:46 +0200
Subject: [PATCH 15/22] xdg-screensaver: use D-Bus api instead of
gnome-screensaver call.
---
scripts/xdg-screensaver.in | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
index b05ab2c..8315f6a 100644
--- a/scripts/xdg-screensaver.in
+++ b/scripts/xdg-screensaver.in
@@ -466,7 +466,12 @@ screensaver_gnome_screensaver()
;;
lock)
- gnome-screensaver-command --lock > /dev/null 2> /dev/null
+ dbus-send --session \
+ --dest=org.gnome.ScreenSaver \
+ --type=method_call \
+ /org/gnome/ScreenSaver \
+ org.gnome.ScreenSaver.Lock \
+ 2> /dev/null
result=$?
;;
--
2.1.0

39
0016-xdg-email-do-not-encode-character.patch
View File

@ -1,39 +0,0 @@
From 7cd846d62e17f36be2f7d29e56188ddf6a6d72cb Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 25 Aug 2014 07:31:15 -0500
Subject: [PATCH 16/22] xdg-email: do not encode - character
---
ChangeLog | 3 +++
scripts/xdg-email.in | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index f29d9d6..2554692 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.x ===
+2014-08-25 Rex Dieter <rdieter@fedoraproject.org>
+ * xdg-email: do not encode - character
+
2014-04-26 Rex Dieter <rdieter@fedoraproject.org>
* xdg-open fails to open web browser urls with a query string (BR45857)
diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
index 4c3cb83..54de71f 100644
--- a/scripts/xdg-email.in
+++ b/scripts/xdg-email.in
@@ -226,7 +226,7 @@ result=$(echo "$str" | awk '
c = substr ($0, i, 1)
if ( ord [c] > 127 ) {
e = e "%" sprintf("%02X", ord [c])
- } else if ( c ~ /[@a-zA-Z0-9.-\\\/]/ ) {
+ } else if ( c ~ /[@a-zA-Z0-9.\-\\\/]/ ) {
e = e c
} else {
e = e "%" sprintf("%02X", ord [c])
--
2.1.0

28
0017-bump-version-output-to-rc3.patch
View File

@ -1,28 +0,0 @@
From 781023ef997bac433dbc258bd5cfdc1366f2ffa4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Wed, 27 Aug 2014 15:35:16 -0500
Subject: [PATCH 17/22] bump --version output to rc3
missed the ball for rc2
---
scripts/xdg-utils-common.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
index c365cca..37c4082 100644
--- a/scripts/xdg-utils-common.in
+++ b/scripts/xdg-utils-common.in
@@ -226,8 +226,8 @@ check_common_commands()
exit_success
;;
- --version)
- echo "@NAME@ 1.1.0 rc1"
+ t --version)
+ echo "@NAME@ 1.1.0 rc3"
exit_success
;;
esac
--
2.1.0

40
0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch
View File

@ -1,40 +0,0 @@
From 48545132620f85d3ba133010116884a63f26f3a3 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Wed, 17 Sep 2014 06:31:40 -0500
Subject: [PATCH 18/22] xdg-utils-common is broken, xdg-open uses bashism
(#83979)
---
scripts/xdg-open.in | 2 +-
scripts/xdg-utils-common.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 917df2c..244f214 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -54,7 +54,7 @@ get_key()
desktop_entry="y"
;;
# Reset match flag for other groups
- [*)
+ "["*)
desktop_entry=""
;;
*)
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
index 37c4082..2c8fa46 100644
--- a/scripts/xdg-utils-common.in
+++ b/scripts/xdg-utils-common.in
@@ -226,7 +226,7 @@ check_common_commands()
exit_success
;;
- t --version)
+ --version)
echo "@NAME@ 1.1.0 rc3"
exit_success
;;
--
2.1.0

41
0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch
View File

@ -1,41 +0,0 @@
From 190448845baaccf68154e7d03392c74cbe163505 Mon Sep 17 00:00:00 2001
From: Ken Neighbors <ken@nsds.com>
Date: Fri, 19 Sep 2014 09:29:49 -0700
Subject: [PATCH 19/22] xdg-settings: convert multi-group desktop file to XFCE
WebBrowser helper file
When generating an XFCE helper file for the default WebBrowser, the
XFCE keys cannot always simply be appended to the end of the file, but
must be placed in the first group under "[Desktop Entry]". (A desktop
file can contain additional group headers, such as
"X-Ayatana-Desktop-Shortcuts" groups.)
---
scripts/xdg-settings.in | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
index eaed991..460ffc9 100644
--- a/scripts/xdg-settings.in
+++ b/scripts/xdg-settings.in
@@ -407,13 +407,15 @@ check_xfce_desktop_file()
# Found a file to convert.
target="${XDG_DATA_HOME:-$HOME/.local/share}/xfce4/helpers"
mkdir -p "$target"
- grep -v "^Type=" "$file" > "$target/$1"
- echo "Type=X-XFCE-Helper" >> "$target/$1"
+ # Copy file up to first "Exec=" line.
+ sed -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$d' "$file" > "$target/$1"
echo "X-XFCE-Category=WebBrowser" >> "$target/$1"
# Change %F, %f, %U, and %u to "%s".
- command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g'`"
+ command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | sed -e 's/%[FfUu]/"%s"/g' | head -1`"
echo "X-XFCE-Commands=`echo "$command" | first_word`" >> "$target/$1"
echo "X-XFCE-CommandsWithParameter=$command" >> "$target/$1"
+ # Copy rest of file (from first "Exec=" line to end-of-file).
+ sed -n -e 's/^Type=.*/Type=X-XFCE-Helper/' -e '/^Exec[=[]/,$p' "$file" >> "$target/$1"
return
fi
done
--
2.1.0

27
0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch
View File

@ -1,27 +0,0 @@
From 0c465c119130c2739e3086b7d3573313cb19233a Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Tue, 15 Jul 2014 16:42:27 +0000
Subject: [PATCH 20/22] xdg-email: reset the IFS before interpreting a shell
command.
---
scripts/xdg-email.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
index 54de71f..e68425c 100644
--- a/scripts/xdg-email.in
+++ b/scripts/xdg-email.in
@@ -207,6 +207,9 @@ open_generic()
url_encode()
{
+# The shell needs the default internal field separator
+# otherwise it would search for $utf8 as a command in whole.
+IFS=" "
str=$(echo "$1" | $utf8)
local ORIG_LANG="$LANG"
local ORIG_LC_ALL="$LC_ALL"
--
2.1.0

29
0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch
View File

@ -1,29 +0,0 @@
From d6e0924bdf917d118dba993534cc3f335ab0a160 Mon Sep 17 00:00:00 2001
From: David Costa <david.costa@ieee.org>
Date: Tue, 24 Jun 2014 20:01:07 +0200
Subject: [PATCH 21/22] xdg-open: fixes #63153 keeping the path as URL
---
scripts/xdg-open.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index 244f214..cc2fc9c 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -306,10 +306,10 @@ open_lxde()
if (echo "$1" | grep -q '^file://' ||
! echo "$1" | egrep -q '^[[:alpha:]+\.\-]+:')
then
- local file="$(echo "$1" | sed 's%^file://%%')"
+ local file="$1"
# handle relative paths
- if ! echo "$file" | grep -q '^/'; then
+ if ! echo "$file" | egrep -q '^(file://)?/'; then
file="$(pwd)/$file"
fi
--
2.1.0

28
0022-update-Changelog-for-recent-contributed-patches.patch
View File

@ -1,28 +0,0 @@
From 6b0f4390ab468c142ab51fd0851c64efeb996ff0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Fri, 19 Sep 2014 13:07:11 -0500
Subject: [PATCH 22/22] update Changelog for recent contributed patches
---
ChangeLog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 2554692..f90ba4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
=== xdg-utils 1.1.x ===
+2014-09-19 Rex Dieter <rdieter@fedoraproject.org>
+ * XFCE .desktop file created for browser selection is broken (BR56092)
+ * Unnecessary filtering file:// for pcmanfm (BR63153)
+ * fails if user sets a custom IFS environment variable (BR81386)
+
+2014-09-17 Rex Dieter <rdieter@fedoraproject.org>
+ * xdg-utils-common is broken, xdg-open uses bashism (BR83979)
2014-08-25 Rex Dieter <rdieter@fedoraproject.org>
* xdg-email: do not encode - character
--
2.1.0

98
0023-make-release-distclean-targets-suck-less.patch
View File

@ -1,98 +0,0 @@
From e962f0387cc670c96165383a1f9a8ae5251bd1ec Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 22 Sep 2014 13:38:42 -0500
Subject: [PATCH 23/24] make release/distclean targets suck less
still more work to do
---
Makefile.in | 2 +-
scripts/Makefile.in | 19 +++++++++----------
tests/Makefile.in | 2 +-
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 37a025b..25dc59f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@ distclean: clean $(SUBDIRS:%=%/__distclean__)
rm -f config.* Makefile
rm -rf autom4te.cache
-release: $(SUBDIRS:%=%/__release__) distclean
+release: $(SUBDIRS:%=%/__release__)
rm -f *~
help:
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 9a772bc..d167393 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -27,30 +27,29 @@ SCRIPTS = \
# xdg-terminal
MANPAGES= $(SCRIPTS:%=man/%.1)
-WEBPAGES= $(SCRIPTS:%=%.html)
+WEBPAGES= $(SCRIPTS:%=html/%.html)
XMLFILES= $(SCRIPTS:%=desc/%.xml)
all: html man scripts
-html: index.html $(WEBPAGES)
+html: html/index.html $(WEBPAGES)
scripts: README $(SCRIPTS)
man: $(MANPAGES)
release: scripts html man
- rm -f xdg-*.in *~ HACKING generate-help-script.awk
- rm -rf desc/
- rm -rf xsl/
+ rm -f *~
+ #rm -rf desc/ xsl/
rm -f xdg-file-dialog xdg-su xdg-copy xdg-terminal
-distclean: clean
- rm -f Makefile
+distclean: clean
+ rm -f Makefile man/xdg-*.1 html/xdg-*.html
clean: scripts-clean
scripts-clean:
- rm -f $(SCRIPTS) README man/xdg-*.1 html/xdg-*.html
+ rm -f $(SCRIPTS) README
README: $(SCRIPTS)
echo > $@
@@ -103,12 +102,12 @@ xdg-terminal: xdg-terminal.in xdg-utils-common.in
man/%.1: desc/%.xml
(cd man;$(XMLTO) man ../$<)
-index.html: $(XMLFILES)
+html/index.html: $(XMLFILES)
(cat html/index.html.pre; \
xsltproc xsl/refentry2htmlindex.xsl $(XMLFILES); \
cat html/index.html.post ) > html/index.html
-%.html: desc/%.xml
+html/%.html: desc/%.xml
(cd html;$(XMLTO) html-nochunks ../$<)
%.txt: desc/%.xml
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c57b0e0..a27504b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -15,7 +15,7 @@ mandir = @mandir@
all:
release:
- rm -rf xdg-su tmp
+ rm -rf tmp
rm -f xdg-test.log *~
test:
--
1.9.3

111
0024-Initial-support-for-Plasma5.patch
View File

@ -1,111 +0,0 @@
From 18645a50fe25064b42ba421e231869c6063705f7 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 22 Sep 2014 14:31:20 -0500
Subject: [PATCH 24/24] Initial support for Plasma5
... largely thanks to Karol Herbst
---
ChangeLog | 4 ++++
RELEASE_NOTES | 2 +-
scripts/xdg-mime.in | 20 ++++++++++++--------
scripts/xdg-open.in | 19 +++++++++++--------
4 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f90ba4e..077fb52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
=== xdg-utils 1.1.x ===
+
+2014-09-22 Rex Dieter <rdieter@fedoraproject.org>
+ * Initial support for Plasma5 (largely thanks to Karol Herbst)
+
2014-09-19 Rex Dieter <rdieter@fedoraproject.org>
* XFCE .desktop file created for browser selection is broken (BR56092)
* Unnecessary filtering file:// for pcmanfm (BR63153)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 484b2b9..eee8ac5 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -2,7 +2,7 @@ Release notes for xdg-utils 1.1.0
=================================
This release includes:
-* better support for GNOME3, KDE4, LXDE, MATE, XFCE
+* better support for GNOME3, KDE4, Plasma5, LXDE, MATE, XFCE
* initial support for generic methods (non toolkit-specific, experimental)
* xdg-settings utility, a script to get various settings from the desktop
environment
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
index 474dc5d..b324be9 100644
--- a/scripts/xdg-mime.in
+++ b/scripts/xdg-mime.in
@@ -36,11 +36,7 @@ update_mime_database()
detectDE
if [ x"$DE" = x"kde" ] ; then
DEBUG 1 "Running kbuildsycoca"
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- eval 'kbuildsycoca4'$xdg_redirect_output
- else
- eval 'kbuildsycoca'$xdg_redirect_output
- fi
+ eval 'kbuildsycoca${KDE_SESSION_VERSION}'$xdg_redirect_output
fi
fi
for x in `echo "$PATH:/opt/gnome/bin" | sed 's/:/ /g'`; do
@@ -54,9 +50,17 @@ update_mime_database()
info_kde()
{
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- DEBUG 1 "Running kmimetypefinder \"$1\""
- kmimetypefinder "$1" 2>/dev/null | head -n 1
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ case "${KDE_SESSION_VERSION}" in
+ 4)
+ DEBUG 1 "Running kmimetypefinder \"$1\""
+ kmimetypefinder "$1" 2>/dev/null | head -n 1
+ ;;
+ 5)
+ DEBUG 1 "Running kmimetypefinder${KDE_SESSION_VERSION} \"$1\""
+ kmimetypefinder${KDE_SESSION_VERSION} "$1" 2>/dev/null | head -n 1
+ ;;
+ esac
else
DEBUG 1 "Running kfile \"$1\""
kfile "$1" 2> /dev/null | head -n 1 | cut -d "(" -f 2 | cut -d ")" -f 1
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
index cc2fc9c..0145be3 100644
--- a/scripts/xdg-open.in
+++ b/scripts/xdg-open.in
@@ -81,15 +81,18 @@ open_darwin()
open_kde()
{
- if kde-open -v 2>/dev/null 1>&2; then
- kde-open "$1"
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ case "${KDE_SESSION_VERSION}" in
+ 4)
+ kde-open "$1"
+ ;;
+ 5)
+ kde-open${KDE_SESSION_VERSION} "$1"
+ ;;
+ esac
else
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- kfmclient openURL "$1"
- else
- kfmclient exec "$1"
- kfmclient_fix_exit_code $?
- fi
+ kfmclient exec "$1"
+ kfmclient_fix_exit_code $?
fi
if [ $? -eq 0 ]; then
--
1.9.3

119
0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch
View File

@ -1,119 +0,0 @@
From 345ef333025ba386494a7ca0bc1ccd91f319f926 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Mon, 22 Sep 2014 15:29:40 -0500
Subject: [PATCH 25/25] more plasma5: ktraderclient5, kreadconfig5,
kwriteconfig5
---
scripts/xdg-email.in | 9 +++++++--
scripts/xdg-mime.in | 18 ++++++++++++++----
scripts/xdg-settings.in | 20 +++++++++++++++++---
3 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/scripts/xdg-email.in b/scripts/xdg-email.in
index e68425c..c8909d0 100644
--- a/scripts/xdg-email.in
+++ b/scripts/xdg-email.in
@@ -85,8 +85,13 @@ run_thunderbird()
open_kde()
{
local client kde_email_profile_name
- kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile`
- client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ kde_email_profile_name=`kreadconfig5 --file emaildefaults --group Defaults --key Profile`
+ client=`kreadconfig5 --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
+ else
+ kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile`
+ client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
+ fi
echo $client | grep thunderbird > /dev/null 2>&1
if [ $? -eq 0 ] ; then
run_thunderbird "$client" "$1"
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
index b324be9..0290d77 100644
--- a/scripts/xdg-mime.in
+++ b/scripts/xdg-mime.in
@@ -398,10 +398,20 @@ defapp_generic()
defapp_kde()
{
MIME="$1"
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- KTRADER=`which ktraderclient 2> /dev/null`
- MIMETYPE="--mimetype"
- SERVICETYPE="--servicetype"
+
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ case "${KDE_SESSION_VERSION}" in
+ 4)
+ KTRADER=`which ktraderclient 2> /dev/null`
+ MIMETYPE="--mimetype"
+ SERVICETYPE="--servicetype"
+ ;;
+ 5)
+ KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
+ MIMETYPE="--mimetype"
+ SERVICETYPE="--servicetype"
+ ;;
+ esac
else
KTRADER=`which ktradertest 2> /dev/null`
fi
diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
index 460ffc9..20a9f94 100644
--- a/scripts/xdg-settings.in
+++ b/scripts/xdg-settings.in
@@ -146,10 +146,15 @@ read_kde_config()
configfile="$1"
configsection="$2"
configkey="$3"
- application="`kreadconfig --file $configfile --group $configsection --key $configkey`"
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ application="`kreadconfig5 --file $configfile --group $configsection --key $configkey`"
+ else
+ application="`kreadconfig --file $configfile --group $configsection --key $configkey`"
+ fi
if [ x"$application" != x ]; then
echo "$application"
else
+ if [ x"${KDE_SESSION_VERSION}" = x"4" ]; then
# kreadconfig in KDE 4 may not notice Key[$*]=... localized settings, so
# check by hand if it didn't find anything (oddly kwriteconfig works
# fine though).
@@ -158,6 +163,7 @@ read_kde_config()
[ ! -f "$configfile_path" ] && return
# This will only take the first value if there is more than one.
grep "^$configkey"'\[$[^]=]*\]=' "$configfile_path" | head -n 1 | cut -d= -f 2-
+ fi
fi
}
@@ -239,7 +245,11 @@ check_browser_kde()
set_browser_kde()
{
set_browser_mime "$1" || return
- kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1"
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ kwriteconfig5 --file kdeglobals --group General --key BrowserApplication "$1"
+ else
+ kwriteconfig --file kdeglobals --group General --key BrowserApplication "$1"
+ fi
}
# }}} KDE
@@ -516,7 +526,11 @@ set_url_scheme_handler_kde()
set_browser_mime "$2" "x-scheme-handler/$1" || return
if [ "$1" = "mailto" ]; then
binary="`desktop_file_to_binary "$2"`"
- kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary"
+ if [ x"${KDE_SESSION_VERSION}" = x"5" ]; then
+ kwriteconfig5 --file emaildefaults --group PROFILE_Default --key EmailClient "$binary"
+ else
+ kwriteconfig --file emaildefaults --group PROFILE_Default --key EmailClient "$binary"
+ fi
fi
}
--
1.9.3

62
0026-xdg-screensaver-plasma5-support.patch
View File

@ -1,62 +0,0 @@
From aa251a926130fbd3f4bade766ce5d2e0e2cb4c73 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Thu, 9 Oct 2014 09:35:21 -0500
Subject: [PATCH 26/26] xdg-screensaver plasma5 support
---
ChangeLog | 3 +++
scripts/xdg-screensaver.in | 16 ++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 077fb52..3399286 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
=== xdg-utils 1.1.x ===
+2014-10-09 Rex Dieter <rdieter@fedoraproject.org>
+ * xdg-screensaver plasma5 support
+
2014-09-22 Rex Dieter <rdieter@fedoraproject.org>
* Initial support for Plasma5 (largely thanks to Karol Herbst)
diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
index 8315f6a..6ad9930 100644
--- a/scripts/xdg-screensaver.in
+++ b/scripts/xdg-screensaver.in
@@ -86,13 +86,17 @@ perform_action()
case "$DE" in
kde)
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
- screensaver_freedesktop "$1"
- else
- screensaver_kde "$1"
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
+ case "${KDE_SESSION_VERSION}" in
+ 4|5)
+ screensaver_freedesktop "$1"
+ ;;
+ *)
+ screensaver_kde3 "$1"
+ ;;
+ esac
fi
;;
-
gnome_screensaver)
screensaver_gnome_screensaver "$1"
;;
@@ -314,7 +318,7 @@ screensaver_freedesktop()
esac
}
-screensaver_kde()
+screensaver_kde3()
{
case "$1" in
suspend)
--
1.9.3

2
sources
View File

@ -1 +1 @@
38b6f1d38cb02297ddbf64dba0a907a4 xdg-utils-1.1.0-rc2.tar.gz 617ef5f9872ab5b148ad4717bc9012f5 xdg-utils-1.1.0-rc3.tar.gz

34
xdg-utils.spec
View File

@ -1,10 +1,10 @@
%define pre rc2 %define pre rc3
Summary: Basic desktop integration functions Summary: Basic desktop integration functions
Name: xdg-utils Name: xdg-utils
Version: 1.1.0 Version: 1.1.0
Release: 0.31.%{pre}%{?dist} Release: 0.32.%{pre}%{?dist}
URL: http://portland.freedesktop.org/ URL: http://portland.freedesktop.org/
%if 0%{?pre:1} %if 0%{?pre:1}
@ -14,33 +14,8 @@ Source1: xdg-utils-git_checkout.sh
Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz
%endif %endif
License: MIT License: MIT
## upstream patches ## upstream patches
Patch101: 0001-mention-xdg-settings.patch
Patch102: 0002-Improvement-of-detecting-KDE-session-BR63157.patch
Patch103: 0003-xdg-terminal-incompatible-.-BR44357.patch
Patch104: 0004-remove-generated-html-files.patch
Patch105: 0005-remove-generated-man-pages.patch
Patch106: 0006-all-re-generate-html-man-too.patch
Patch107: 0007-drop-references-to-Value-1.0-key-BR74688.patch
Patch108: 0008-xdg-open-Remove-first_word-already-in-common.patch
Patch109: 0009-xdg-open-Expand-i-and-c-from-Exec.patch
Patch110: 0010-xdg-open-Support-multiple-groups.patch
Patch111: 0011-followup-fix-for-prior-commit.patch
Patch112: 0012-xdg-open-fails-to-open-web-browser-urls-with-a-query.patch
Patch113: 0013-xdg-open-use-kde-open-noninteractive-BR16295.patch
Patch114: 0014-Revert-xdg-open-use-kde-open-noninteractive-BR16295.patch
Patch115: 0015-xdg-screensaver-use-D-Bus-api-instead-of-gnome-scree.patch
Patch116: 0016-xdg-email-do-not-encode-character.patch
Patch117: 0017-bump-version-output-to-rc3.patch
Patch118: 0018-xdg-utils-common-is-broken-xdg-open-uses-bashism-839.patch
Patch119: 0019-xdg-settings-convert-multi-group-desktop-file-to-XFC.patch
Patch120: 0020-xdg-email-reset-the-IFS-before-interpreting-a-shell-.patch
Patch121: 0021-xdg-open-fixes-63153-keeping-the-path-as-URL.patch
Patch122: 0022-update-Changelog-for-recent-contributed-patches.patch
Patch123: 0023-make-release-distclean-targets-suck-less.patch
Patch124: 0024-Initial-support-for-Plasma5.patch
Patch125: 0025-more-plasma5-ktraderclient5-kreadconfig5-kwriteconfi.patch
Patch126: 0026-xdg-screensaver-plasma5-support.patch
# make sure BuildArch comes *after* patches, to ensure %%autosetup works right # make sure BuildArch comes *after* patches, to ensure %%autosetup works right
# http://bugzilla.redhat.com/1084309 # http://bugzilla.redhat.com/1084309
@ -115,6 +90,9 @@ make install DESTDIR=%{buildroot}
%changelog %changelog
* Sat Jan 03 2015 Rex Dieter <rdieter@fedoraproject.org> 1.1.0-0.32.rc3
- xdg-utils-1.1.0-rc3
* Tue Oct 21 2014 Rex Dieter <rdieter@fedoraproject.org> 1.1.0-0.31.rc2 * Tue Oct 21 2014 Rex Dieter <rdieter@fedoraproject.org> 1.1.0-0.31.rc2
- workaround %%autosetup failure harder (#1084309) - workaround %%autosetup failure harder (#1084309)