From f26a4e3ecb24379bdafbf5a6d60fbae7de4a227f Mon Sep 17 00:00:00 2001 From: Raphael Groner Date: Jun 03 2016 19:18:42 +0000 Subject: fix XDG_CURRENT_DESKTOP for epel7 --- diff --git a/lxqt-common-0.10.0-fedora-defaults.patch b/lxqt-common-0.10.0-fedora-defaults.patch index 45ce46f..169d3a0 100644 --- a/lxqt-common-0.10.0-fedora-defaults.patch +++ b/lxqt-common-0.10.0-fedora-defaults.patch @@ -43,15 +43,3 @@ diff -up lxqt-common-0.10.0/config/pcmanfm-qt/lxqt/settings.conf.in.fedora_defau BgColor=#000000 FgColor=#ffffff ShadowColor=#000000 -diff -up lxqt-common-0.10.0/startlxqt.in.fedora_defaults lxqt-common-0.10.0/startlxqt.in ---- lxqt-common-0.10.0/startlxqt.in.fedora_defaults 2015-10-08 11:38:12.000000000 -0500 -+++ lxqt-common-0.10.0/startlxqt.in 2016-04-28 11:21:51.061479776 -0500 -@@ -62,7 +62,7 @@ export QT_QPA_PLATFORMTHEME=lxqt - # use lxqt-applications.menu for main app menu - export XDG_MENU_PREFIX="lxqt-" - --export XDG_CURRENT_DESKTOP="LXQt" -+export XDG_CURRENT_DESKTOP="X-LXQt" - - # Start the LXQt session - exec lxqt-session diff --git a/lxqt-common.spec b/lxqt-common.spec index 5400229..c32248e 100644 --- a/lxqt-common.spec +++ b/lxqt-common.spec @@ -1,7 +1,7 @@ Name: lxqt-common Summary: Common resources for LXQt desktop suite Version: 0.10.0 -Release: 11%{?dist} +Release: 12%{?dist} License: LGPLv2+ URL: http://lxqt.org/ @@ -70,10 +70,12 @@ popd %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +# let desktop-file-validate be happy +sed -i -r 's|(XDG_CURRENT_DESKTOP=")(.*)"|\1X-\2"|' %{buildroot}%{_bindir}/startlxqt for desktop in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop; do echo ${desktop} - cat ${desktop} desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop} + cat ${desktop} done # Fedora theme %if 0%{?fedora} @@ -125,6 +127,9 @@ fi %changelog +* Fri Jun 03 2016 Raphael Groner - 0.10.0-12 +- fix XDG_CURRENT_DESKTOP for epel7 + * Tue May 31 2016 Than Ngo 0.10.0-11 - add rhel support