From 3367e1d5005606ae4b2c90353b762a43512a31c5 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Feb 28 2015 18:05:41 +0000
Subject: - Update to fix xdg issues and add fedora theme


---

diff --git a/.gitignore b/.gitignore
index accf0d9..45d0354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /lxqt-common-0.9.0.tar.xz
 /lxqt-common-0.9.0.0ad2b72.tar.xz
 /lxqt-common-0.9.1.tar.xz
+/lxqt-theme-fedora.tar.xz
diff --git a/lxqt-common-0.9.1-fedora-defaults.patch b/lxqt-common-0.9.1-fedora-defaults.patch
new file mode 100644
index 0000000..f302a99
--- /dev/null
+++ b/lxqt-common-0.9.1-fedora-defaults.patch
@@ -0,0 +1,56 @@
+diff -r -u lxqt-common-0.9.1-orig/config/lxqt.conf lxqt-common-0.9.1/config/lxqt.conf
+--- lxqt-common-0.9.1-orig/config/lxqt.conf	2015-02-14 11:42:58.000000000 -0200
++++ lxqt-common-0.9.1/config/lxqt.conf	2015-02-28 14:29:56.461533354 -0300
+@@ -1,11 +1,14 @@
+ [General]
+-theme=frost
++theme=Fedora
+ icon_theme=oxygen
+ single_click_activate=false
+ tool_button_style=ToolButtonTextBesideIcon
+ 
++[Mouse]
++cursor_theme=Oxygen_White
++
+ [Qt]
+-font="Sans,11,-1,5,50,0,0,0,0,0"
++font="Sans,10,-1,5,50,0,0,0,0,0"
+ doubleClickInterval=400
+-style=Fusion
++style=Oxygen
+ wheelScrollLines=3
+diff -r -u lxqt-common-0.9.1-orig/config/pcmanfm-qt/lxqt/settings.conf.in lxqt-common-0.9.1/config/pcmanfm-qt/lxqt/settings.conf.in
+--- lxqt-common-0.9.1-orig/config/pcmanfm-qt/lxqt/settings.conf.in	2015-02-14 11:42:58.000000000 -0200
++++ lxqt-common-0.9.1/config/pcmanfm-qt/lxqt/settings.conf.in	2015-02-28 14:34:50.558345252 -0300
+@@ -4,8 +4,8 @@
+ TerminalCommand=
+ Archiver=file-roller
+ SIUnit=false
+-TerminalDirCommand=xterm
+-TerminalExecCommand=xterm -e %s
++TerminalDirCommand=qterminal
++TerminalExecCommand=qterminal -e %s
+ 
+ [Behavior]
+ BookmarkOpenMethod=0
+@@ -15,7 +15,7 @@
+ 
+ [Desktop]
+ WallpaperMode=stretch
+-Wallpaper=@LXQT_SHARE_DIR@/themes/light/simple_blue_widescreen.png
++Wallpaper=/usr/share/backgrounds/default.png
+ BgColor=#000000
+ FgColor=#ffffff
+ ShadowColor=#000000
+diff -r -u lxqt-common-0.9.1-orig/startlxqt.in lxqt-common-0.9.1/startlxqt.in
+--- lxqt-common-0.9.1-orig/startlxqt.in	2015-02-14 11:42:58.000000000 -0200
++++ lxqt-common-0.9.1/startlxqt.in	2015-02-28 14:28:04.237223539 -0300
+@@ -40,7 +40,7 @@
+ # 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 d063811..92cae0d 100644
--- a/lxqt-common.spec
+++ b/lxqt-common.spec
@@ -1,16 +1,20 @@
-%global git_short_rev 0ad2b72
-
 Name:    lxqt-common
 Summary: Common resources for LXQt desktop suite
 Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL:     http://lxqt.org/
 Source0: http://downloads.lxqt.org/lxqt/0.9.0/lxqt-common-%{version}.tar.xz
+Source1: lxqt-theme-fedora.tar.xz 
+Patch0:  lxqt-common-0.9.1-fedora-defaults.patch
 BuildArch: noarch
 
+Requires: oxygen-cursor-themes
 Requires: oxygen-icon-theme
+Requires: fedora-logos
+Requires: desktop-backgrounds-compat
 Requires: dbus-x11
+Requires: lxqt-theme
 
 BuildRequires: cmake >= 2.8.9
 BuildRequires: pkgconfig(Qt5Xdg)
@@ -22,8 +26,16 @@ BuildRequires: desktop-file-utils
 %description
 %{summary}.
 
+%package -n lxqt-theme-fedora
+Summary: Default Fedora theme for LXQt
+Provides: lxqt-theme = %{version} 
+
+%description -n lxqt-theme-fedora
+%{summary}.
+
 %prep
 %setup -q
+%patch0 -p1 -b .fedora_defaults
 
 %build
 mkdir -p %{_target_platform}
@@ -42,6 +54,11 @@ for desktop in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop; do
 	desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop}
 done
 
+# Fedora theme
+pushd %{buildroot}/%{_datadir}/lxqt/themes/ 
+	tar	xfJ %{SOURCE1}
+popd
+
 %posttrans
 update-desktop-database -q &> /dev/null || :
 
@@ -65,11 +82,20 @@ fi
 %{_datadir}/lxqt/openbox
 %{_datadir}/desktop-directories/lxqt-settings.directory
 %{_sysconfdir}/xdg/menus/lxqt-applications.menu
-%exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop
 %{_datadir}/desktop-directories/lxqt-leave.directory
 %{_datadir}/icons/hicolor/*/*/*
+%exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop
+%exclude %{_datadir}/lxqt/themes/Fedora
+
+%files -n lxqt-theme-fedora
+%dir %{_datadir}/lxqt/themes/Fedora
+%{_datadir}/lxqt/themes/Fedora/*
 
 %changelog
+* Sat Feb 28 2015 Helio Chissini de Castro <helio@kde.org> - 0.9.1-3
+- Fixed xdg entriy preventing session to load proper lxqt resources
+- Added Fedora theme and make it default
+
 * Wed Feb 18 2015 Helio Chissini de Castro <helio@kde.org> - 0.9.1-2
 - Rebuild (gcc5)
 
diff --git a/sources b/sources
index beb8c27..725c7b7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 7db547d46c4e4e5efb6b3ee8e4a90ad9  lxqt-common-0.9.1.tar.xz
+9fcbac5366dde4ede2e3c567a35a0a14  lxqt-theme-fedora.tar.xz