X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kp5-plasma-pa.spec;h=8636396b56759b78cc6167b424baa874f65d64f0;hb=5bf41289d3671331443122993e8718e341d0e320;hp=6d03139bfb1f2e553a75a4399da92fe2b5196dbe;hpb=dde6081240319cb1c3a2375c8bd44c96503f016d;p=packages%2Fkp5-plasma-pa.git

diff --git a/kp5-plasma-pa.spec b/kp5-plasma-pa.spec
index 6d03139..8636396 100644
--- a/kp5-plasma-pa.spec
+++ b/kp5-plasma-pa.spec
@@ -1,15 +1,18 @@
-%define		kdeplasmaver	5.14.5
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
+%define		kdeplasmaver	5.25.0
 %define		qtver		5.9.0
 %define		kpname		plasma-pa
 
 Summary:	KDE Plasma Pulse Audio
 Name:		kp5-%{kpname}
-Version:	5.14.5
+Version:	5.25.0
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5:	ab16b6976bf83f4a4c1825456d23f356
+Source0:	https://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
+# Source0-md5:	6ac98faf711cf6abcd8c57671b56bcab
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	cmake >= 2.8.12
@@ -31,6 +34,7 @@ BuildRequires:	kf5-kpeople-devel
 BuildRequires:	kf5-krunner-devel
 BuildRequires:	kf5-kwallet-devel
 BuildRequires:	kf5-plasma-framework-devel
+BuildRequires:	ninja
 BuildRequires:	pulseaudio-devel
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	xorg-driver-input-evdev-devel
@@ -51,16 +55,20 @@ KDE Plasma Pulse Audio.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
+	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+	-DHTML_INSTALL_DIR=%{_kdedocdir} \
 	../
-%{__make}
+%ninja_build
+
+%if %{with tests}
+ctest
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} -C build/ install \
-        DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %find_lang %{kpname} --all-name --with-kde
 
@@ -83,27 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/kde4/apps/kconf_update
 %{_datadir}/kde4/apps/kconf_update/disable_kmix.upd
 %attr(755,root,root) %{_datadir}/kde4/apps/kconf_update/plasmaVolumeDisableKMixAutostart.pl
-%dir %{_datadir}/kpackage/kcms/kcm_pulseaudio
-%dir %{_datadir}/kpackage/kcms/kcm_pulseaudio/contents
-%dir %{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/Advanced.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/Applications.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/CardListItem.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/DefaultDeviceButton.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/DeviceComboBox.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/DeviceListItem.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/Devices.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/Header.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/ListItemSeperator.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/MuteButton.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/StreamListItem.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/VolumeSlider.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/contents/ui/main.qml
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/metadata.desktop
-%{_datadir}/kpackage/kcms/kcm_pulseaudio/metadata.json
+%{_datadir}/kpackage/kcms/kcm_pulseaudio
 %{_datadir}/kservices5/kcm_pulseaudio.desktop
-%{_datadir}/kservices5/plasma-applet-org.kde.plasma.volume.desktop
 %{_datadir}/metainfo/org.kde.plasma.volume.appdata.xml
-%dir %{_datadir}/plasma/plasmoids/org.kde.plasma.volume
-%{_datadir}/plasma/plasmoids/org.kde.plasma.volume/contents.rcc
-%{_datadir}/plasma/plasmoids/org.kde.plasma.volume/metadata.json
+%{_datadir}/plasma/plasmoids/org.kde.plasma.volume
+%{_datadir}/kservices5/plasma-applet-org.kde.plasma.volume.desktop