[kdeplasma-addons/f19: 11/14] Revert "kdeobservatory requires qwt5-qt4, so add BuildConflicts: pkgconfig(qwt) to avoid"

Rex Dieter rdieter at fedoraproject.org
Thu Sep 5 20:29:19 UTC 2013


commit fc7c01a9fc4b6781c7683076dab08c8b648644fd
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 15:28:39 2013 -0500

    Revert "kdeobservatory requires qwt5-qt4, so add BuildConflicts: pkgconfig(qwt) to avoid"
    
    This reverts commit f70d0d1c6c81f5d36ece99d8f59431b3f875e9b0.

 kdeplasma-addons.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 24126ca..a8f8383 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -34,9 +34,9 @@ BuildRequires: marble-devel >= 1:%{version}
 BuildRequires: pkgconfig(qoauth)
 # plasma-applet-kimpanel
 BuildRequires: pkgconfig(ibus-1.0)
-# kdeobservatory requires qwt5-qt4, be mindful of this if building locally
-BuildConflicts: pkgconfig(qwt)
-BuildRequires: pkgconfig(qwt5-qt4)
+# FIXME: be mindful of this if building locally -- rex
+BuildConflicts: pkgconfig(qwt5-qt4)
+BuildRequires: pkgconfig(qwt)
 %endif
 BuildRequires: pkgconfig(dbusmenu-qt)
 BuildRequires: pkgconfig(libattica)


More information about the scm-commits mailing list