Merge branch 'master' into f21

.gitignore

@@ -1,3 +1,2 @@
 /phonon-4.7.2.tar.xz
-/phonon-4.7.80.tar.xz
+/phonon-4.8.1.tar.xz
-/phonon-4.8.0.tar.xz

phonon.spec

@@ -10,8 +10,8 @@
 
 Summary: Multimedia framework api
 Name:    phonon
-Version: 4.8.0
+Version: 4.8.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
@@ -42,6 +42,8 @@ BuildRequires: pkgconfig(QtDBus) pkgconfig(QtDesigner) pkgconfig(QtOpenGL) pkgco
 # Qt5
 BuildRequires: pkgconfig(Qt5DBus) pkgconfig(Qt5Designer) pkgconfig(Qt5OpenGL) pkgconfig(Qt5Widgets)
 BuildRequires: pkgconfig(Qt5Declarative)
+# temporary workaround qt5-qttools packaging bug
+BuildRequires: qt5-designer-plugin-webkit
 %if 0%{?zeitgeist}
 BuildRequires: pkgconfig(QZeitgeist)
 %endif
@@ -198,6 +200,9 @@ test "$(pkg-config --modversion phonon4qt5)" = "%{version}"
 
 
 %changelog
+* Fri Oct 17 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.1-1
+- phonon-4.8.1
+
 * Mon Sep 08 2014 Rex Dieter <rdieter@fedoraproject.org> 4.8.0-2
 - 4.8.0
 

sources

@@ -1 +1 @@
-30af25af0bf28f3ce462f39b0a6e4081  phonon-4.8.0.tar.xz
+2da3a26b911b23bb29d6ba2d07044a08  phonon-4.8.1.tar.xz