From ab68ec8fc845792c964732801d5fe2d337c10e47 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Sep 09 2015 16:30:48 +0000
Subject: Change the xinit.d script to an xdg autostart file


Resolves: #1259896

---

diff --git a/xdg-user-dirs.desktop b/xdg-user-dirs.desktop
new file mode 100644
index 0000000..f87ad58
--- /dev/null
+++ b/xdg-user-dirs.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=User folders update
+Exec=xdg-user-dirs-update
+StartupNotify=false
+NoDisplay=true
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
diff --git a/xdg-user-dirs.sh b/xdg-user-dirs.sh
deleted file mode 100644
index 92dfe5a..0000000
--- a/xdg-user-dirs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2007 Red Hat, Inc. All rights reserved. This
-# copyrighted material is made available to anyone wishing to use, modify,
-# copy, or redistribute it subject to the terms and conditions of the
-# GNU General Public License version 2.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-if [ -x /usr/bin/xdg-user-dirs-update ]; then
-    /usr/bin/xdg-user-dirs-update
-fi    
diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec
index e3ffe33..68bc59c 100644
--- a/xdg-user-dirs.spec
+++ b/xdg-user-dirs.spec
@@ -3,14 +3,14 @@
 
 Name:		xdg-user-dirs
 Version:	0.15
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Handles user special directories
 
 Group:		User Interface/Desktops
 License:	GPLv2+ and MIT
 URL:		http://freedesktop.org/wiki/Software/xdg-user-dirs
 Source0:	http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
-Source1:	xdg-user-dirs.sh
+Source1:	xdg-user-dirs.desktop
 
 # use fuzzy translations (for Downloads)
 # https://bugzilla.redhat.com/show_bug.cgi?id=532399
@@ -19,7 +19,7 @@ Patch0:		use-fuzzy.patch
 BuildRequires:	gettext
 BuildRequires:  docbook-style-xsl
 BuildRequires:  libxslt
-Requires:	%{_sysconfdir}/X11/xinit/xinitrc.d
+Requires:      %{_sysconfdir}/xdg/autostart
 
 %description
 Contains xdg-user-dirs-update that updates folders in a users
@@ -39,8 +39,8 @@ make update-gmo
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
 
 %find_lang %name
 
@@ -50,12 +50,16 @@ install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/xdg/user-dirs.conf
 %config(noreplace) %{_sysconfdir}/xdg/user-dirs.defaults
-%{_sysconfdir}/X11/xinit/xinitrc.d/*
+%{_sysconfdir}/xdg/autostart/*
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
 
 %changelog
+* Wed Sep  9 2015 Rui Matos <rmatos@redhat.com> - 0.15-7
+- Change the xinit.d script to an xdg autostart file
+Resolves: #1259896
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.15-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild