[kdebase-workspace] fix Conflicts

Rex Dieter rdieter at fedoraproject.org
Mon Mar 7 17:21:01 UTC 2011


commit 762d7e034b154f27c523e34795c0731764682f17
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 7 11:20:38 2011 -0600

    fix Conflicts

 kdebase-workspace.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index d0befee..748a585 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -209,7 +209,7 @@ Requires: %{name} = %{version}-%{release}
 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-wallpaper < 4.6.1-2
+Conflicts: kdebase-workspace < 4.6.1-2
 Requires: kde-filesystem
 BuildArch: noarch
 %description wallpapers
@@ -632,6 +632,9 @@ fi
 %{_kde4_libdir}/libtaskmanager.so
 %{_kde4_libdir}/libweather_ion.so
 
+%files ksplash-themes
+%defattr(-,root,root,-)
+
 %files wallpapers
 %defattr(-,root,root,-)
 %{_kde4_datadir}/wallpapers/Aghi/


More information about the scm-commits mailing list