[kdebase-workspace] kdebase-workspace-wallpapers -> kde-wallpapers

Rex Dieter rdieter at fedoraproject.org
Mon Oct 24 14:54:58 UTC 2011


commit d3568c0bb68d6f7c891a1bf9ad593bece14916f0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 24 10:02:24 2011 -0500

    kdebase-workspace-wallpapers -> kde-wallpapers

 kdebase-workspace.spec |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index e3f5170..1105d74 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -234,15 +234,16 @@ BuildArch: noarch
 %description ksplash-themes
 %{summary}, including Default (Air and Horos).
 
-%package wallpapers
+%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
-Provides: kde-wallpapers = %{version}-%{release}
+Obsoletes: kdebase-workspace-wallpapers < 4.7.2-9
+Provides:  kdebase-workspace-wallpapers = %{version}-%{release}
 Requires: kde-filesystem
 BuildArch: noarch
-%description wallpapers
+%description -n kde-wallpapers
 %{summary}.
 
 %package -n kdm
@@ -718,7 +719,7 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/ksplash/Themes/Default/
 
-%files wallpapers
+%files -n kde-wallpapers
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/Aghi/
 %{_kde4_datadir}/wallpapers/Air/
@@ -735,7 +736,6 @@ fi
 %{_kde4_datadir}/wallpapers/Plasmalicious/
 %{_kde4_datadir}/wallpapers/Quadros
 %{_kde4_datadir}/wallpapers/Red_Leaf/
-%{_kde4_datadir}/wallpapers/stripes.png*
 
 %files -n kdm
 %defattr(-,root,root,-)
@@ -751,6 +751,8 @@ fi
 %{_kde4_appsdir}/doc/kdm/
 %{_kde4_appsdir}/kdm/
 %{_kde4_datadir}/kde4/services/kdm.desktop
+# not sure why this is included in kdm sources... ? -- rex
+%{_kde4_datadir}/wallpapers/stripes.png*
 
 %post -n ksysguard
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -809,7 +811,6 @@ fi
 %files -n libkworkspace
 %{_kde4_libdir}/libkworkspace.so.4*
 
-
 %files -n oxygen-cursor-themes
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/Oxygen_Black/
@@ -851,6 +852,9 @@ fi
 
 
 %changelog
+* Mon Oct 24 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-9
+- kdebase-workspace-wallpapers -> kde-wallpapers
+
 * Fri Oct 21 2011 Alexey Kurov <nucleo at fedoraproject.org> - 4.7.2-8
 - revert patch adding broken launchers (#747982)
 


More information about the scm-commits mailing list