[kdebase-workspace] drop kde-wallpapers (now packaged separately)

[Rex Dieter]

commit 7b6488192af8ab2dfdf0e4eb8de745f10fbb3dd8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 1 12:26:03 2011 -0500

    drop kde-wallpapers (now packaged separately)

 .gitignore             |    1 -
 kdebase-workspace.spec |   74 ++++++++---------------------------------------
 sources                |    1 -
 3 files changed, 13 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f54b74e..4368f54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /kde-wallpapers-4.7.2.tar.bz2
 /kde-workspace-4.7.2.tar.bz2
-/kde-wallpapers-4.7.3.tar.bz2
 /kde-workspace-4.7.3.tar.bz2
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 8b87223..aa2fe43 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,13 +9,12 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
 URL:     http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-workspace-%{version}.tar.bz2
-Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-wallpapers-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # RH/Fedora-specific startkde changes
@@ -242,18 +241,6 @@ BuildArch: noarch
 %description ksplash-themes
 %{summary}, including Default (Air and Horos).
 
-%package -n kde-wallpapers
-Summary: KDE wallpapers
-Group: User Interface/Desktops
-# Horos wallpaper moved back here in 4.6.1-2 (originally moved to main in 4.6.0-8)
-Conflicts: kdebase-workspace < 4.6.1-2
-Obsoletes: kdebase-workspace-wallpapers < 4.7.2-10
-Provides:  kdebase-workspace-wallpapers = %{version}-%{release}
-Requires: kde-filesystem
-BuildArch: noarch
-%description -n kde-wallpapers
-%{summary}.
-
 %package -n kdm
 Summary: The KDE login manager
 group: User Interface/X
@@ -340,14 +327,7 @@ Requires: akonadi
 
 
 %prep
-
-%setup -q -T -c -a 0
-%setup -q -T -D -a 1
-
-# mimic old kdebase-workspace behaviour to match package name
-mv kde-workspace-%{version} %{name}-%{version}
-
-pushd %{name}-%{version}
+%setup -q -n kde-workspace-%{version}
 
 %patch1 -p1 -b .redhat_startkde
 # Well, I looked at doing this using the context menu plugin system and it
@@ -377,39 +357,26 @@ pushd %{name}-%{version}
 # Fedora patches
 %patch200 -p0 -b .no_HAL
 %patch210 -p1 -b .no_HAL2
-popd
 
 
 %build
 
-pushd %{name}-%{version}
-    mkdir -p %{_target_platform}
-    pushd %{_target_platform}
-        %{cmake_kde4} \
-          -DKDE4_KDM_PAM_SERVICE=kdm \
-          -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
-          -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
-          ..
-    popd
-
-    make %{?_smp_mflags} -C %{_target_platform} 
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+  -DKDE4_KDM_PAM_SERVICE=kdm \
+  -DKDE4_KCHECKPASS_PAM_SERVICE=kcheckpass \
+  -DKDE4_KSCREENSAVER_PAM_SERVICE=kscreensaver \
+  ..
 popd
 
-pushd kde-wallpapers-%{version}
-    mkdir -p %{_target_platform}
-    pushd %{_target_platform}
-        %{cmake_kde4} ..
-    popd
-
-    make %{?_smp_mflags} -C %{_target_platform} 
-popd
+make %{?_smp_mflags} -C %{_target_platform} 
 
 
 %install
 rm -rf %{buildroot}
 
 make install/fast DESTDIR=%{buildroot} -C %{name}-%{version}/%{_target_platform}
-make install/fast DESTDIR=%{buildroot} -C kde-wallpapers-%{version}/%{_target_platform}
 
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
@@ -726,24 +693,6 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/ksplash/Themes/Default/
 
-%files -n kde-wallpapers
-%defattr(-,root,root,-)
-%{_kde4_datadir}/wallpapers/Aghi/
-%{_kde4_datadir}/wallpapers/Air/
-%{_kde4_datadir}/wallpapers/Autumn/
-%{_kde4_datadir}/wallpapers/Blue_Wood
-%{_kde4_datadir}/wallpapers/Evening/
-%{_kde4_datadir}/wallpapers/Fields_of_Peace/
-%{_kde4_datadir}/wallpapers/Finally_Summer_in_Germany/
-%{_kde4_datadir}/wallpapers/Fresh_Morning/
-%{_kde4_datadir}/wallpapers/Grass/
-%{_kde4_datadir}/wallpapers/Hanami/
-%{_kde4_datadir}/wallpapers/Horos/
-%{_kde4_datadir}/wallpapers/Media_Life/
-%{_kde4_datadir}/wallpapers/Plasmalicious/
-%{_kde4_datadir}/wallpapers/Quadros
-%{_kde4_datadir}/wallpapers/Red_Leaf/
-
 %files -n kdm
 %defattr(-,root,root,-)
 %{_kde4_bindir}/genkdmconf
@@ -859,6 +808,9 @@ fi
 
 
 %changelog
+* Tue Nov 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-5
+- drop kde-wallpapers (now packaged separately)
+
 * Tue Nov 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.3-4
 - tarball respin
 
diff --git a/sources b/sources
index c612a4b..57bbaf4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-163103fa8a003ad5e692858213391542  kde-wallpapers-4.7.3.tar.bz2
 f65eafd8d1a48a16be272d5383b3e22a  kde-workspace-4.7.3.tar.bz2