[kdeplasma-addons] pkgconfig-style deps fix marble deps drop old/deprecated Obsoletes/Provides

[Rex Dieter]

commit bcd0a58051fcf1bc6298738f221eaf957aa596f7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 28 10:02:47 2011 -0500

    pkgconfig-style deps
    fix marble deps
    drop old/deprecated Obsoletes/Provides

 kdeplasma-addons.spec |   43 +++++++++++++++----------------------------
 1 files changed, 15 insertions(+), 28 deletions(-)
---
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 5eb2540..a294ced 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,7 +1,7 @@
 Name:           kdeplasma-addons
 Summary:        Additional plasmoids for KDE
 Version:        4.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          User Interface/Desktops
@@ -13,47 +13,29 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
 
-BuildRequires:  attica-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext
 BuildRequires:  kdepimlibs-devel >= %{version}
-# for libplasmaclock, nepomuk
+# for libplasmaclock
 BuildRequires:  kdebase-workspace-devel >= %{version}
 %if 0%{?fedora}
-BuildRequires:  eigen2-devel
+BuildRequires:  pkgconfig(eigen2)
 # plasma-wallpaper-marble 
 BuildRequires:  marble-devel >= 1:%{version}
 %endif
-# lancelot eye-candy
-BuildRequires:  libXcomposite-devel libXrender-devel libXdamage-devel
+BuildRequires:  pkgconfig(libattica)
 BuildRequires:  pkgconfig(libkexiv2) >= 0.4.0
-BuildRequires:  qca2-devel
-BuildRequires:  qimageblitz-devel
+BuildRequires:  pkgconfig(libqalculate)
+BuildRequires:  pkgconfig(qca2)
+BuildRequires:  pkgconfig(qimageblitz)
+# lancelot eye-candy
+BuildRequires:  pkgconfig(xcomposite) pkgconfig(xdamage) pkgconfig(xrender)
 BuildRequires:  qwt-devel
-BuildRequires:  soprano-devel
-BuildRequires:  libqalculate-devel
 # legacy scim-based kimpanel purposely omitted 
 #BuildRequires: scim-devel
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-%if 0%{?fedora} < 15
-## F12
-# when -libs was introduced
-Obsoletes: kdeplasma-addons < 4.3.0-3
-Obsoletes: kde-plasma-weather < 1.0.0-100
-Provides:  kde-plasma-weather = 1.0.0-100
-## F10-era stuff
-Obsoletes: kde-plasma-lancelot < 4.0.80
-Provides: kde-plasma-lancelot = %{version}-%{release}
-# rename
-Obsoletes: extragear-plasma < 4.1 
-Provides:  extragear-plasma = %{version}-%{release}
-# another rename
-Obsoletes: kdeplasmoids < 4.1 
-Provides: kdeplasmoids = %{version}-%{release}
-%endif
-
 # included in since 4.6 (f15)
 Obsoletes: plasma-runner-events < 0.3.0-100
 Provides:  plasma-runner-events = 0.3.0-100
@@ -89,7 +71,7 @@ Files for developing applications using %{name}.
 %package -n plasma-wallpaper-marble
 Summary:  Marble wallpaper for kde-plasma 
 Group:    User Interface/Desktops 
-Requires: kdeedu-marble >= %{version}
+Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 %description -n plasma-wallpaper-marble 
 %{summary}.
 
@@ -187,6 +169,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 28 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.1-2
+- pkgconfig-style deps
+- fix marble deps
+- drop old/deprecated Obsoletes/Provides
+
 * Fri Sep 02 2011 Than Ngo <than at redhat.com> - 4.7.1-1
 - 4.7.1