Merge branch 'master' into f24

.gitignore

@@ -1,3 +1,4 @@
 /plasma-integration-5.6.95.tar.xz
 /plasma-integration-5.7.0.tar.xz
 /plasma-integration-5.7.1.tar.xz
+/plasma-integration-5.7.2.tar.xz

plasma-integration.spec

@@ -1,7 +1,7 @@
 Name:    plasma-integration
 Summary: Qt Platform Theme integration plugin for Plasma
-Version: 5.7.1
-Release: 2%{?dist}
+Version: 5.7.2
+Release: 1%{?dist}
 
 # KDE e.V. may determine that future LGPL versions are accepted
 License: LGPLv2 or LGPLv3
@@ -41,8 +41,8 @@ BuildRequires:  cmake(KF5Wayland)
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
-BuildRequires:  plasma-breeze-devel >= %{version}
-Requires:       plasma-breeze >= %{version}
+BuildRequires:  plasma-breeze-devel >= %{majmin_ver}
+Requires:       plasma-breeze >= %{majmin_ver}
 Requires:       breeze-cursor-theme >= %{majmin_ver}
 Requires:       breeze-icon-theme
 %if 0%{?fedora} < 23
@@ -57,6 +57,10 @@ Requires:       plasma-workspace >= %{majmin_ver}
 %prep
 %autosetup -p1
 
+sed -i.breeze_version \
+  -e "s|^find_package(Breeze \${PROJECT_VERSION} |find_package(Breeze %{majmin_ver} |g" \
+  CMakeLists.txt
+
 
 %build
 mkdir %{_target_platform}
@@ -79,6 +83,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue Jul 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.2-1
+- 5.7.2
+
+* Sun Jul 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-3
+- rebuild (qt5-qtbase)
+
 * Thu Jul 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
 - BR: plasma-breeze-devel
 

sources

@@ -1 +1 @@
-5773a4c50708b7c7e4c14c96f65b1e9a  plasma-integration-5.7.1.tar.xz
+222c4bb5f3195c3a05ba5af062aa853a  plasma-integration-5.7.2.tar.xz