From 6e0419bcd66035b7450f75f163f3c88ed2524a45 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Fri, 22 Jun 2012 20:06:00 +0400
Subject: [PATCH] Update backgrounds location for Xfce 4.10.

/usr/share/xfce4/backdrops/ -> /usr/share/backgrounds/xfce/.
---
 branding.spec                                    | 16 ++++++++--------
 .../xfconf/xfce-perchannel-xml/xfce4-desktop.xml |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/branding.spec b/branding.spec
index 09fae3a..0e37353 100644
--- a/branding.spec
+++ b/branding.spec
@@ -283,13 +283,13 @@ cp -r xfce-settings/etcskel/.vimrc %buildroot/etc/skel/
 install -m 644 xfce-settings/etcskel/.wm-select %buildroot/etc/skel/
 install -m 644 xfce-settings/etcskel/.fonts.conf %buildroot/etc/skel/
 
-mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200
-mkdir -p %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050
-cp -P xfce-settings/backgrounds/*.jpg %buildroot/usr/share/xfce4/backdrops/
-install -m 644 xfce-settings/backgrounds/vladstudio.com/LICENSE.txt %buildroot/usr/share/xfce4/backdrops/vladstudio.com/
-install -m 644 xfce-settings/backgrounds/vladstudio.com/1600x1200/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1600x1200/
-install -m 644 xfce-settings/backgrounds/vladstudio.com/1680x1050/* %buildroot/usr/share/xfce4/backdrops/vladstudio.com/1680x1050/
-install -m 644 xfce-settings/backgrounds/slinux*.jpg %buildroot/usr/share/xfce4/backdrops/
+mkdir -p %buildroot/usr/share/backgrounds/xfce/vladstudio.com/1600x1200
+mkdir -p %buildroot/usr/share/backgrounds/xfce/vladstudio.com/1680x1050
+cp -P xfce-settings/backgrounds/*.jpg %buildroot/usr/share/backgrounds/xfce
+install -m 644 xfce-settings/backgrounds/vladstudio.com/LICENSE.txt %buildroot/usr/share/backgrounds/xfce/vladstudio.com/
+install -m 644 xfce-settings/backgrounds/vladstudio.com/1600x1200/* %buildroot/usr/share/backgrounds/xfce/vladstudio.com/1600x1200/
+install -m 644 xfce-settings/backgrounds/vladstudio.com/1680x1050/* %buildroot/usr/share/backgrounds/xfce/vladstudio.com/1680x1050/
+install -m 644 xfce-settings/backgrounds/slinux*.jpg %buildroot/usr/share/backgrounds/xfce/
 
 install -pDm0755 xfce-settings/scripts/zdg-move-templates.sh %buildroot%_sysconfdir/X11/profile.d/zdg-move-templates.sh
 
@@ -384,7 +384,7 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 /etc/skel/.config
 /etc/skel/.gconf
 /etc/skel/.vimrc
-/usr/share/xfce4/backdrops
+/usr/share/backgrounds/xfce/*
 
 %files slideshow
 /etc/alterator/slideshow.conf
diff --git a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index ff251ce..1673d42 100644
--- a/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/xfce-settings/etcskel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -4,9 +4,9 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/xfce4/backdrops/slinux_spring_1680x1050.jpg"/>
-        <property name="last-image" type="string" value="/usr/share/xfce4/backdrops/vladstudio.com/1600x1200/vladstudio_blex_1600x1200.jpg"/>
-        <property name="last-single-image" type="string" value="/usr/share/xfce4/backdrops/slinux_spring_1680x1050.jpg"/>
+        <property name="image-path" type="string" value="/usr/share/backgrounds/xfce/slinux_spring_1680x1050.jpg"/>
+        <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/vladstudio.com/1600x1200/vladstudio_blex_1600x1200.jpg"/>
+        <property name="last-single-image" type="string" value="/usr/share/backgrounds/xfce/slinux_spring_1680x1050.jpg"/>
         <property name="color-style" type="int" value="3"/>
         <property name="image-style" type="int" value="0"/>
       </property>