[kdeplasma-addons] 4.9.90

Rex Dieter rdieter at fedoraproject.org
Tue Dec 4 14:24:04 UTC 2012


commit 32f86096fbc7de864609a3cbe049274f4606c418
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Dec 4 08:24:12 2012 -0600

    4.9.90

 .gitignore                        |    4 +---
 kdeplasma-addons-bug-879802.patch |   24 ------------------------
 kdeplasma-addons.spec             |   23 +++++++++++++++++------
 sources                           |    2 +-
 4 files changed, 19 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ed03f8e..d60379b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
 /kdeplasma-addons-4.8.5.tar.xz
-/kdeplasma-addons-4.9.1.tar.xz
-/kdeplasma-addons-4.9.2.tar.xz
-/kdeplasma-addons-4.9.3.tar.xz
 /kdeplasma-addons-4.9.4.tar.xz
+/kdeplasma-addons-4.9.90.tar.xz
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 5a9c07d..f8e6d38 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,6 +1,6 @@
 Name:    kdeplasma-addons
 Summary: Additional plasmoids for KDE
-Version: 4.9.4
+Version: 4.9.90
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -18,7 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ## upstreamable patches
 
 ## upstream patches
-Patch200: kdeplasma-addons-bug-879802.patch
 
 # rhel patches
 Patch300: kdeplasma-addons-4.9.0-rhel.patch
@@ -36,7 +35,9 @@ BuildRequires: marble-devel >= 1:%{version}
 BuildRequires: pkgconfig(qoauth)
 # plasma-applet-kimpanel
 BuildRequires: pkgconfig(ibus-1.0)
-BuildRequires: qwt-devel
+# FIXME: be mindful of this if building locally -- rex
+BuildConflicts: pkgconfig(qwt5-qt4)
+BuildRequires: pkgconfig(qwt)
 %endif
 BuildRequires: pkgconfig(dbusmenu-qt)
 BuildRequires: pkgconfig(libattica)
@@ -101,8 +102,6 @@ Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 %prep
 %setup -q -n kdeplasma-addons-%{version}%{?alphatag}
 
-%patch200 -p1 -b .bug879802
-
 %if 0%{?rhel}
 %patch300 -p1 -b .rhel
 %endif
@@ -160,9 +159,16 @@ fi
 %{_kde4_appsdir}/desktoptheme/*
 %{_kde4_appsdir}/lancelot/
 %{_kde4_appsdir}/plasmaboard/
+%{_kde4_appsdir}/plasma/packages/org.kde.comic/
+%{_kde4_appsdir}/plasma/packages/org.kde.lcdweather/
+%{_kde4_appsdir}/plasma/packages/org.kde.weather/
+%{_kde4_appsdir}/plasma/packages/calculator/
 %{_kde4_appsdir}/plasma/plasmoids/nowplaying/
 %{_kde4_appsdir}/plasma/plasmoids/konqprofiles/
 %{_kde4_appsdir}/plasma/plasmoids/konsoleprofiles/
+%{_kde4_appsdir}/plasma/wallpapers/org.kde.animals/
+%{_kde4_appsdir}/plasma/wallpapers/org.kde.haenau/
+%{_kde4_appsdir}/plasma/wallpapers/org.kde.hunyango/
 %{_kde4_appsdir}/plasma/services/org.kde.plasma.dataengine.konqprofiles.operations
 %{_kde4_appsdir}/plasma/services/org.kde.plasma.dataengine.konsoleprofiles.operations
 %{_kde4_appsdir}/plasma-applet-frame/
@@ -173,6 +179,7 @@ fi
 %{_kde4_appsdir}/plasma_pastebin/
 %{_kde4_appsdir}/plasma_wallpaper_pattern/
 %{_kde4_appsdir}/rssnow/
+%{_kde4_libdir}/kde4/kcm_krunner_dictionary.so
 %{_kde4_libdir}/kde4/kcm_krunner_audioplayercontrol.so
 %{_kde4_libdir}/kde4/kcm_krunner_charrunner.so
 %{_kde4_libdir}/kde4/kcm_krunner_spellcheck.so
@@ -182,6 +189,7 @@ fi
 %{_kde4_libdir}/kde4/krunner_charrunner.so
 %{_kde4_libdir}/kde4/krunner_contacts.so
 %{_kde4_libdir}/kde4/krunner_converter.so
+%{_kde4_libdir}/kde4/krunner_dictionary.so
 %{_kde4_libdir}/kde4/krunner_katesessions.so
 %{_kde4_libdir}/kde4/krunner_konquerorsessions.so
 %{_kde4_libdir}/kde4/krunner_konsolesessions.so
@@ -195,7 +203,6 @@ fi
 %{_kde4_libdir}/kde4/plasma_applet_blackboard.so
 %{_kde4_libdir}/kde4/plasma_applet_bookmarks.so
 %{_kde4_libdir}/kde4/plasma_applet_bubblemon.so
-%{_kde4_libdir}/kde4/plasma_applet_calculator.so
 %{_kde4_libdir}/kde4/plasma_applet_charselect.so
 %{_kde4_libdir}/kde4/plasma_applet_comic.so
 %{_kde4_libdir}/kde4/plasma_applet_eyes.so
@@ -227,6 +234,7 @@ fi
 %{_kde4_libdir}/kde4/plasma_applet_webslice.so
 %{_kde4_libdir}/kde4/plasma_engine_rtm.so
 %{_kde4_libdir}/kde4/plasma_wallpaper_mandelbrot.so
+%{_kde4_libdir}/kde4/plasma_wallpaper_qml.so
 %{_kde4_libdir}/kde4/plasma_engine_microblog.so
 %endif
 %{_kde4_libdir}/kde4/plasma_applet_opendesktop_activities.so
@@ -426,6 +434,9 @@ fi
 
 
 %changelog
+* Tue Dec 04 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9.90-1
+- 4.9.90
+
 * Mon Dec 03 2012 Than Ngo <than at redhat.com> - 4.9.4-1
 - 4.9.4
 
diff --git a/sources b/sources
index 7637cb5..3674b71 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-630c2db7f869591e80e8f5493890ef58  kdeplasma-addons-4.9.4.tar.xz
+89d4bea445bfb3a8b85a3f988d634155  kdeplasma-addons-4.9.90.tar.xz


More information about the scm-commits mailing list