Merge branch 'master' into f24

epel9
Rex Dieter 9 years ago
commit 9794c3ee05

8
.gitignore vendored

@ -1,5 +1,3 @@
/plasma-integration-5.6.1.tar.xz /plasma-integration-5.6.95.tar.xz
/plasma-integration-5.6.2.tar.xz /plasma-integration-5.7.0.tar.xz
/plasma-integration-5.6.3.tar.xz /plasma-integration-5.7.1.tar.xz
/plasma-integration-5.6.4.tar.xz
/plasma-integration-5.6.5.tar.xz

@ -1,7 +1,7 @@
Name: plasma-integration Name: plasma-integration
Summary: Qt Platform Theme integration plugin for Plasma Summary: Qt Platform Theme integration plugin for Plasma
Version: 5.6.5 Version: 5.7.1
Release: 2%{?dist} Release: 1%{?dist}
# KDE e.V. may determine that future LGPL versions are accepted # KDE e.V. may determine that future LGPL versions are accepted
License: LGPLv2 or LGPLv3 License: LGPLv2 or LGPLv3
@ -34,14 +34,15 @@ BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF5Notifications) BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5Wayland) >= %{majmin_ver} BuildRequires: cmake(KF5Wayland)
## TODO: verify this is needed, not 100% sure -- rex ## TODO: verify this is needed, not 100% sure -- rex
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Requires: plasma-breeze >= %{majmin_ver} BuildRequires: plasma-breeze >= %{version}
Requires: plasma-breeze >= %{version}
Requires: breeze-cursor-theme >= %{majmin_ver} Requires: breeze-cursor-theme >= %{majmin_ver}
Requires: breeze-icon-theme Requires: breeze-icon-theme
%if 0%{?fedora} < 23 %if 0%{?fedora} < 23
@ -78,6 +79,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog %changelog
* Tue Jul 12 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-1
- 5.7.1
* Thu Jun 30 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.0-1
- 5.7.0
* Sat Jun 25 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.95-1
- 5.6.95
* Thu Jun 16 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.5-2 * Thu Jun 16 2016 Rex Dieter <rdieter@fedoraproject.org> 5.6.5-2
- BR: qt5-qtbase-private-devel - BR: qt5-qtbase-private-devel

@ -1 +1 @@
bf34fb0e93402001f327bf99c195cebe plasma-integration-5.6.5.tar.xz 5773a4c50708b7c7e4c14c96f65b1e9a plasma-integration-5.7.1.tar.xz

Loading…
Cancel
Save