From 7005a2ed3f97e40104147b20e8ae8e0ca22f56ab Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jan 20 2015 20:00:25 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index b8b6769..b52942f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-/kdeplasma-addons-4.13.97.tar.xz
-/kdeplasma-addons-4.14.0.tar.xz
-/kdeplasma-addons-4.14.1.tar.xz
-/kdeplasma-addons-4.14.2.tar.xz
 /kdeplasma-addons-4.14.3.tar.xz
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 36f5199..a8b67b9 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -2,7 +2,7 @@
 Name:    kdeplasma-addons
 Summary: Additional plasmoids for KDE
 Version: 4.14.3
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 URL:     http://www.kde.org/
@@ -92,7 +92,7 @@ Summary: Plasma applet for input methods
 
 %package -n plasma-wallpaper-marble
 Summary:  Marble wallpaper for kde-plasma 
-Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
+#Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 %description -n plasma-wallpaper-marble 
 %{summary}.
 
@@ -430,6 +430,12 @@ fi
 
 
 %changelog
+* Tue Jan 20 2015 Rex Dieter <rdieter@fedoraproject.org> 4.14.3-3
+- kde-apps fixes (can't rely on kde4_version to match marble)
+
+* Tue Dec 16 2014 Rex Dieter <rdieter@fedoraproject.org> 4.14.3-2
+- rebuild (marble)
+
 * Sun Nov 09 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.14.3-1
 - 4.14.3