[kdeplasma-addons] - Obsoletes/Provides: plasma-runner-events - drop old Obsoletes (f15+)

Rex Dieter rdieter at fedoraproject.org
Tue Jan 25 19:30:28 UTC 2011


commit b6e87afea63eb9daef9c0b9ec36050ba5c75dfbb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 25 13:29:50 2011 -0600

    - Obsoletes/Provides: plasma-runner-events
    - drop old Obsoletes (f15+)

 kdeplasma-addons.spec |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)
---
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index afc4c8c..67b1b3a 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,6 +1,6 @@
 Name:           kdeplasma-addons
 Version:        4.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plasmoids for KDE
 
 Group:          User Interface/Desktops
@@ -37,24 +37,30 @@ BuildRequires:  libqalculate-devel
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
+%if 0%{?fedora} < 15
+## F12
 # when -libs was introduced
 Obsoletes: kdeplasma-addons < 4.3.0-3
-
-# most of former kdeaddons for KDE3 is now here
-Obsoletes: kdeaddons < 4
-# extragear-plasma -> kdeplasmoids rename
+## F11-era stuff
+# rename
 Obsoletes: extragear-plasma < 4.1 
 Provides:  extragear-plasma = %{version}-%{release}
-# Oh gawd, another rename
+# another rename
 Obsoletes: kdeplasmoids < 4.1 
 Provides: kdeplasmoids = %{version}-%{release}
+%endif
 
 Obsoletes: kde-plasma-lancelot < 4.0.80 
 Provides: kde-plasma-lancelot = %{version}-%{release}
 
+# when did this land?  -- Rex
 Obsoletes: kde-plasma-weather < 1.0.0-100
 Provides: kde-plasma-weather = 1.0.0-100
 
+# included in since 4.6 (f15)
+Obsoletes: plasma-runner-events < 0.3.0-100
+Provides:  plasma-runner-events = 0.3.0-100
+
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 
 # dataengines
@@ -185,6 +191,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jan 25 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.0-2
+- Obsoletes/Provides: plasma-runner-events
+- drop old Obsoletes (f15+)
+
 * Fri Jan 21 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.0-1
 - 4.6.0
 


More information about the scm-commits mailing list