Author Login
Post Reply
Colin Guthrie wrote:
> I think helio already changed it to Requires(pre) so hopefully he's
> still listening, like a silent packaging ninja!
Perhaps he's not listening :)
Here is my fix, I would just commit it but I know the KDE team are fast
and I don't want to commit something that they may have in their local
trees already :)
Col
--
+--------------------------+
| Colin Guthrie |
+--------------------------+
| cguthrie(at)mandriva.org |
| http://colin.guthr.ie/ |
+--------------------------+
Index: SPECS/kdeplasmoids4.spec
===================================================================
--- SPECS/kdeplasmoids4.spec (revision 227724)
+++ SPECS/kdeplasmoids4.spec (working copy)
@@(protected) @@
Obsoletes: kdeplayground4-plasma
Obsoletes: kdeplayground4-plasma-devel
Obsoletes: extragear-plasma < 4.0.82
-Requires(pre): plasma-applet-filewatcher
-Requires(pre): plasma-applet-notes
-Requires(pre): plasma-applet-bluemarble
-Requires(pre): plasma-applet-showdesktop
-Requires(pre): plasma-applet-comic
-Requires(pre): plasma-applet-konqprofiles
-Requires(pre): plasma-applet-konsoleprofiles
-Requires(pre): plasma-applet-luna
-Requires(pre): plasma-applet-twitter
-Requires(pre): plasma-applet-nowplaying
-Requires(pre): plasma-applet-binaryclock
-Requires(pre): plasma-applet-dict
-Requires(pre): plasma-applet-fuzzy-clock
-Requires(pre): plasma-applet-frame
-Requires(pre): plasma-applet-showdashboard
-Requires(pre): plasma-applet-calculator
-Requires(pre): plasma-applet-fifteenpuzzle
-Requires(pre): plasma-applet-kolourpicker
-Requires(pre): plasma-dataengine-comic
-Requires(pre): plasma-dataengine-twitter
-Requires(pre): plasma-desktoptheme-default
-Requires(pre): plasma-desktoptheme-heron
-Requires(pre): plasma-desktoptheme-aya
-Requires(pre): plasma-desktoptheme-slim-glow
-Requires(pre): plasma-desktoptheme-silicon
-Requires(pre): plasma-desktoptheme-elegance
-Requires(pre): plasma-runner-converter
-Requires(pre): plasma-runner-contacts
+Requires: plasma-applet-filewatcher
+Requires: plasma-applet-notes
+Requires: plasma-applet-bluemarble
+Requires: plasma-applet-showdesktop
+Requires: plasma-applet-comic
+Requires: plasma-applet-konqprofiles
+Requires: plasma-applet-konsoleprofiles
+Requires: plasma-applet-luna
+Requires: plasma-applet-twitter
+Requires: plasma-applet-nowplaying
+Requires: plasma-applet-binaryclock
+Requires: plasma-applet-dict
+Requires: plasma-applet-fuzzy-clock
+Requires: plasma-applet-frame
+Requires: plasma-applet-showdashboard
+Requires: plasma-applet-calculator
+Requires: plasma-applet-fifteenpuzzle
+Requires: plasma-applet-kolourpicker
+Requires: plasma-dataengine-comic
+Requires: plasma-dataengine-twitter
+Requires: plasma-desktoptheme-default
+Requires: plasma-desktoptheme-heron
+Requires: plasma-desktoptheme-aya
+Requires: plasma-desktoptheme-slim-glow
+Requires: plasma-desktoptheme-silicon
+Requires: plasma-desktoptheme-elegance
+Requires: plasma-runner-converter
+Requires: plasma-runner-contacts
%description
kdeplasma is a compilation of plasma items ( runners, applets, plasmoids ) for kde4.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-filewatcher
Monitor applet for files.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-notes
Plasma notes applets.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-bluemarble
OpenGL world planet applet.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-showdesktop
Show desktop contents.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-applet
Requires: plasma-dataengine-comic
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-comic
Make your day happy with daily desktop comics applet
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-konqprofiles
Live konqueror profile viewer.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-konsoleprofiles
Live konsole profile viewer.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-luna
Lunar calendar applet.
@@(protected) @@
#Group: Graphical desktop/KDE
#Requires: kdebase4-workspace
#Provides: plasma-applet
+#Conflicts: extragear-plasma < 4.0.82
#%description -n plasma-applet-lancelot
#Plasma lancelot applets.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-applet
Requires: plasma-dataengine-twitter
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-twitter
Twiter blog applet
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-nowplaying
Song notifier applet
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-binaryclock
Simplified way to see the hours.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-dict
A dict applets.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-fuzzy-clock
A lazy way to see the hours.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-frame
A basic pictures frame to desktop.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-showdashboard
Plasma showdashboard applets.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-calculator
Plasma calculator applets.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-fifteenpuzzle
Plasma fifteenpuzzle applets.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-applet
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-applet-kolourpicker
Basic color picker.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-dataengine
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-dataengine-comic
Plasma comic dataengines.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-dataengine
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-dataengine-twitter
Plasma twitter dataengines.
@@(protected) @@
Summary: Plasma default desktopthemes
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-desktoptheme-default
Plasma default desktopthemes.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-desktoptheme
Requires: plasma-desktoptheme-default
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-desktoptheme-heron
Plasma heron desktopthemes.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-desktoptheme
Requires: plasma-desktoptheme-default
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-desktoptheme-aya
Plasma aya desktopthemes.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-desktoptheme
Requires: plasma-desktoptheme-default
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-desktoptheme-slim-glow
Plasma slim-glow desktopthemes.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-desktoptheme
Requires: plasma-desktoptheme-default
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-desktoptheme-silicon
Plasma silicon desktopthemes.
@@(protected) @@
Requires: kdebase4-workspace
Provides: plasma-desktoptheme
Requires: plasma-desktoptheme-default
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-desktoptheme-elegance
Plasma elegance desktopthemes.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-runner
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-runner-converter
Plasma converter runners.
@@(protected) @@
Group: Graphical desktop/KDE
Requires: kdebase4-workspace
Provides: plasma-runner
+Conflicts: extragear-plasma < 4.0.82
%description -n plasma-runner-contacts
Plasma contacts runners.