[xfce-utils] Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154) xfrun4 is part of xfce4

[Christoph Wickert]

commit d1e16e47cf4e2071b6450687bfb153ae4718c6ac
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Dec 30 00:22:43 2011 +0100

    Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154)
    xfrun4 is part of xfce4-appfinder in Fedora >= 17

 xfce-utils-4.8.3-check_if_userdir_is_home.patch |   24 ++++++++++++++
 xfce-utils.spec                                 |   39 ++++++++++++++++------
 2 files changed, 52 insertions(+), 11 deletions(-)
---
diff --git a/xfce-utils-4.8.3-check_if_userdir_is_home.patch b/xfce-utils-4.8.3-check_if_userdir_is_home.patch
new file mode 100644
index 0000000..85702eb
--- /dev/null
+++ b/xfce-utils-4.8.3-check_if_userdir_is_home.patch
@@ -0,0 +1,24 @@
+diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
+index f582934..e63eac1 100755
+--- a/scripts/xinitrc.in.in
++++ b/scripts/xinitrc.in.in
+@@ -54,7 +54,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then
+     # a bit of user dir migration...
+     if test -d "$HOME/Desktop" -a ! -L "$HOME/Desktop" \
+             -a "$XDG_DESKTOP_DIR" \
+-            -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR"
++            -a "$HOME/Desktop" != "$XDG_DESKTOP_DIR" \
++            -a "$HOME" != "$XDG_DESKTOP_DIR"
+     then
+         echo "Migrating $HOME/Desktop to $XDG_DESKTOP_DIR..."
+         test -d "$XDG_DESKTOP_DIR" && rmdir "$XDG_DESKTOP_DIR"
+@@ -63,7 +64,8 @@ if test -f "$XDG_CONFIG_HOME/user-dirs.dirs"; then
+ 
+     if test -d "$HOME/Templates" -a ! -L "$HOME/Templates" \
+             -a "$XDG_TEMPLATES_DIR" \
+-            -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR"
++            -a "$HOME/Templates" != "$XDG_TEMPLATES_DIR" \
++            -a "$HOME" != "$XDG_TEMPLATES_DIR"
+     then
+         echo "Migrating $HOME/Templates to $XDG_TEMPLATES_DIR..."
+         test -d "$XDG_TEMPLATES_DIR" && rmdir "$XDG_TEMPLATES_DIR"
diff --git a/xfce-utils.spec b/xfce-utils.spec
index a4c8731..3a60027 100644
--- a/xfce-utils.spec
+++ b/xfce-utils.spec
@@ -17,7 +17,9 @@ Patch2:         xfce-utils-4.7.1-test-running-screensver.patch
 Patch3:         xfce-utils-4.8.0-fix-desktop-categories.patch
 # Already upstream: http://git.xfce.org/xfce/xfce-utils/commit/?id=9b6d7d17b466d605e6cd3febd7291cc0f38c0336
 # Prevents gnome from running the 4.6 migration on gnome login. 
-Patch4:		xfce-utils-4.8.3-46-migration-gnome.patch
+Patch4:         xfce-utils-4.8.3-46-migration-gnome.patch
+# taken from https://bugzilla.xfce.org/show_bug.cgi?id=8154
+Patch5:         xfce-utils-4.8.3-check_if_userdir_is_home.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libxfce4ui-devel >= %{xfceversion}
@@ -52,6 +54,7 @@ This package includes common docs for the Xfce Desktop Environment.
 %patch2 -p1 -b .gnome-screensaver
 %patch3 -p1 -b .desktop-categories
 %patch4 -p1 -b .46-migration-gnome
+%patch5 -p1 -b .check_if_userdir_is_home
 
 
 %build
@@ -61,33 +64,38 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 %find_lang %{name}
 
 desktop-file-install --vendor="" --delete-original \
 	--add-category="Documentation" \
 	--remove-category="X-Xfce-Toplevel" \
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-	$RPM_BUILD_ROOT%{_datadir}/applications/xfce4-about.desktop
+	--dir=%{buildroot}%{_datadir}/applications \
+	%{buildroot}%{_datadir}/applications/xfce4-about.desktop
 
 desktop-file-install --vendor="" --delete-original \
 	--add-category="Documentation" \
 	--remove-category="X-Xfce-Toplevel" \
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-	$RPM_BUILD_ROOT%{_datadir}/applications/xfhelp4.desktop
+	--dir=%{buildroot}%{_datadir}/applications \
+	%{buildroot}%{_datadir}/applications/xfhelp4.desktop
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/xfrun4.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/xfrun4.desktop
 
-desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop
+desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/xfconf-migration-4.6.desktop
     
 # we need the doc package to own these 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr,zh_CN}/images
+mkdir -p %{buildroot}%{_datadir}/xfce4/doc/{ast,C,ca,da,es,fr,gl,id,it,ja,pt,tr,zh_CN}/images
+
+# xfrun4 is part of xfce4-appfinder Fedora > 17
+%if 0%{?fedora} >= 17
+rm -f %{buildroot}%{_bindir}/xfrun4
+%endif
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -117,7 +125,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/xfce4-about
 %{_bindir}/xflock4
 %{_bindir}/xfmountdev4
+
+# xfrun4 is part of xfce4-appfinder Fedora > 17
+%if 0%{?fedora} < 17
 %{_bindir}/xfrun4
+%endif
+
 %{_bindir}/xfterm4
 %{_libdir}/xfce4/xfconf-migration/
 %{_datadir}/icons/hicolor/*/*/*
@@ -134,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_docdir}/%{name}/
 
 %changelog
+* Thu Dec 29 2011 Christoph Wickert <cwickert at fedoraproject.org> - 4.8.3-3
+- Don't try to remove $HOME if it is an xdg-user-dir (bugzilla.xfce.org #8154)
+- xfrun4 is part of xfce4-appfinder in Fedora >= 17
+
 * Fri Dec 09 2011 Kevin Fenzi <kevin at scrye.com> - 4.8.3-2
 - Stop gnome from running 4.6 migration on gnome logins. Fixes bug #760621