From 4f1e4f156e1ea9e957a39be924184349221cf7d4 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jul 01 2014 03:53:08 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 52f265f..407b376 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,9 @@
 /kdeplasma-addons-4.12.1.tar.xz
 /kdeplasma-addons-4.12.2.tar.xz
 /kdeplasma-addons-4.12.3.tar.xz
+/kdeplasma-addons-4.12.90.tar.xz
+/kdeplasma-addons-4.12.95.tar.xz
+/kdeplasma-addons-4.12.97.tar.xz
+/kdeplasma-addons-4.13.0.tar.xz
+/kdeplasma-addons-4.13.1.tar.xz
+/kdeplasma-addons-4.13.2.tar.xz
diff --git a/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 7eb5c9f..c5e4153 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,7 +1,8 @@
+
 Name:    kdeplasma-addons
 Summary: Additional plasmoids for KDE
-Version: 4.12.3
-Release: 1%{?dist}
+Version: 4.13.2
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     http://www.kde.org/
@@ -18,6 +19,7 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 ## upstream patches
 
 # rhel patches
+## omit some stuff, mostly kdewebkit/qtwebkit bits
 Patch300: kdeplasma-addons-4.10.3-rhel.patch
 
 BuildRequires: boost-devel
@@ -26,6 +28,7 @@ BuildRequires: kdepimlibs-devel >= %{version}
 # for libplasmaclock
 BuildRequires: kde-workspace-devel
 %if 0%{?fedora}
+BuildRequires: kdelibs4-webkit-devel
 BuildRequires: pkgconfig(eigen2)
 BuildRequires: pkgconfig(libqalculate)
 # plasma-wallpaper-marble 
@@ -97,10 +100,20 @@ Requires: marble%{?_kde4_version: >= 1:%{_kde4_version}}
 %prep
 %setup -q -n kdeplasma-addons-%{version}%{?alphatag}
 
-%if 0%{?rhel}
+%if ! 0%{?fedora}
 %patch300 -p1 -b .rhel
 %endif
 
+## plasma-dataengine-depextractor love
+# this hack of using find may end up being fragile someday,
+# but it avoids listing *tons* of stuff manually here -- rex
+if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then
+for desktop in $(find applets/ -name *.desktop) ; do
+plasma-dataengine-depextractor $(dirname $desktop) $(basename $desktop)
+done
+plasma-dataengine-depextractor runners/dictionary/ plasma-runner-dictionary.desktop
+fi
+
 
 %build
 mkdir -p %{_target_platform}
@@ -412,6 +425,36 @@ fi
 
 
 %changelog
+* Thu Jun 19 2014 Rex Dieter <rdieter@fedoraproject.org> 4.13.2-2
+- BR: kdelibs4-webkit-devel
+
+* Mon Jun 09 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.2-1
+- 4.13.2
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.13.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 4.13.1-2
+- Rebuild for boost 1.55.0
+
+* Sun May 11 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.1-1
+- 4.13.1
+
+* Sat Apr 19 2014 Rex Dieter <rdieter@fedoraproject.org> 4.13.0-2
+- use plasma-dataengine-depextractor
+
+* Sat Apr 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.13.0-1
+- 4.13.0
+
+* Fri Apr 04 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.97-1
+- 4.12.97
+
+* Sun Mar 23 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.95-1
+- 4.12.95
+
+* Wed Mar 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.90-1
+- 4.12.90
+
 * Sat Mar 01 2014 Rex Dieter <rdieter@fedoraproject.org> - 4.12.3-1
 - 4.12.3
 
diff --git a/sources b/sources
index e683a81..683666c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0024f88d7e528bb16a488f293b152dc4  kdeplasma-addons-4.12.3.tar.xz
+ca11e9c0071787f66006e42cfb74fe98  kdeplasma-addons-4.13.2.tar.xz