[desktop-backgrounds] * Mon Mar 07 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 15.0.0-4 - Drop unused -kde subpackage, we

[Kevin Kofler]

commit 23d2736816d09bd851ccb10d71afe2d2f32b6a0c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Mar 7 18:37:50 2011 +0100

    * Mon Mar 07 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 15.0.0-4
    - Drop unused -kde subpackage, we set the default through kde-settings & pull it
      in through system-plasma-desktoptheme, which is Provided by lovelock-kde-theme

 desktop-backgrounds.spec |   32 ++++++--------------------------
 1 files changed, 6 insertions(+), 26 deletions(-)
---
diff --git a/desktop-backgrounds.spec b/desktop-backgrounds.spec
index 7703fe5..42f409a 100644
--- a/desktop-backgrounds.spec
+++ b/desktop-backgrounds.spec
@@ -5,7 +5,7 @@
 
 Name:           desktop-backgrounds
 Version:        15.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Desktop backgrounds
 
 Group:          User Interface/Desktops
@@ -19,8 +19,6 @@ Source7:        desktop-backgrounds-fedora.xml
 Source8:        fedora-metadata.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-# for %%_kde4_* macros macros
-BuildRequires:  kde-filesystem
 
 %description
 The desktop-backgrounds package contains artwork intended to be used as 
@@ -48,17 +46,6 @@ License:        CC-BY-SA
 The desktop-backgrounds-gnome package contains file-names used by GNOME desktop
 environment to set up the default background.
 
-%package        kde
-Summary:        The default Fedora wallpaper from KDE desktop
-Group:          User Interface/Desktops
-Requires:       %{fedora_release_name}-backgrounds-kde
-Provides:       system-backgrounds-kde = %{version}-%{release}
-License:        CC-BY-SA
-
-%description    kde
-The desktop-backgrounds-kde package contains file-names used by KDE desktop
-environment to set up the default wallpaper.
-
 %package        xfce
 Summary:        The default Fedora wallpaper from XFCE desktop
 Group:          User Interface/Desktops
@@ -154,14 +141,7 @@ sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
   $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
 /bin/ln -s %{fedora_release_name}/default/%{fedora_release_name}.xml \
            $RPM_BUILD_ROOT%{_datadir}/backgrounds/default.xml
-#   for KDE
-mkdir -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default
-install -m 644 -p %{SOURCE8} \
-  $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/default-metadata.desktop
-sed -i 's/@RELEASE_NAME@/%{Fedora_Release_Name}/' \
-  $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/default-metadata.desktop
-/bin/ln -s ../%{Fedora_Release_Name}/contents \
-		   $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers/Default/contents
+#   for KDE, this is handled in kde-settings
 #   for XFCE
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xfce4/backdrops
 /bin/ln -s %{fedora_release_name}.png \
@@ -211,10 +191,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gnome-background-properties/desktop-backgrounds-default.xml
 %{_datadir}/backgrounds/default.xml
 
-%files kde
-%defattr(-, root, root)
-%{_kde4_datadir}/wallpapers/Default
-
 %files xfce
 %defattr(-, root, root)
 %{_datadir}/xfce4/backdrops/default.png
@@ -225,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/backgrounds/default.png
 
 %changelog
+* Mon Mar 07 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 15.0.0-4
+- Drop unused -kde subpackage, we set the default through kde-settings & pull it
+  in through system-plasma-desktoptheme, which is Provided by lovelock-kde-theme
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 15.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild