--- qsampler/trunk/qsampler.spec.in	2021/05/11 08:58:49	3898
+++ qsampler/trunk/qsampler.spec.in	2021/12/05 12:42:31	4005
@@ -18,7 +18,7 @@
 
 %define name    @PACKAGE_TARNAME@
 %define version @PACKAGE_VERSION@
-%define release 47
+%define release 48.1
 
 %define _prefix	@ac_prefix@
 
@@ -26,6 +26,12 @@
 %define debug_package %{nil}
 %endif
 
+%if 0%{?fedora_version} >= 34 || 0%{?suse_version} > 1500
+%define qt_major_version  6
+%else
+%define qt_major_version  5
+%endif
+
 Summary:	A LinuxSampler Qt GUI interface
 Name:		%{name}
 Version:	%{version}
@@ -44,11 +50,33 @@
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
 %if %{defined fedora}
-BuildRequires:	qt5-qtbase-devel >= 5.1, qt5-linguist
-BuildRequires:	qt5-qtsvg-devel, qt5-qtwayland-devel
+%if 0%{qt_major_version} == 6
+BuildRequires:	qt6-qtbase-devel >= 6.1
+BuildRequires:	qt6-qttools-devel
+BuildRequires:	qt6-qtwayland-devel
+BuildRequires:	qt6-qtsvg-devel
+BuildRequires:	qt6-linguist
 %else
-BuildRequires:	libqt5-qtbase-devel >= 5.1, libqt5-linguist-devel
-BuildRequires:	libqt5-qtsvg-devel, libqt5-qtwayland-devel
+BuildRequires:	qt5-qtbase-devel >= 5.1
+BuildRequires:	qt5-qttools-devel
+BuildRequires:	qt5-qtwayland-devel
+BuildRequires:	qt5-qtsvg-devel
+BuildRequires:	qt5-linguist
+%endif
+%else
+%if 0%{qt_major_version} == 6
+BuildRequires:	qt6-base-devel >= 6.1
+BuildRequires:	qt6-tools-devel
+BuildRequires:	qt6-wayland-devel
+BuildRequires:	qt6-svg-devel
+BuildRequires:	qt6-linguist-devel
+%else
+BuildRequires:	libqt5-qtbase-devel >= 5.1
+BuildRequires:	libqt5-qttools-devel
+BuildRequires:	libqt5-qtwayland-devel
+BuildRequires:	libqt5-qtsvg-devel
+BuildRequires:	libqt5-linguist-devel
+%endif
 %endif
 BuildRequires:	liblscp-devel >= 0.5.6
 BuildRequires:	libgig-devel >= 3.3.0
@@ -62,11 +90,12 @@
 %setup -q
 
 %build
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .
-%__make %{?_smp_mflags}
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -Wno-dev -B build
+cmake --build build %{?_smp_mflags}
 
 %install
-%__make DESTDIR="%{buildroot}" install
+DESTDIR="%{buildroot}" \
+cmake --install build
 
 %clean
 [ -d "%{buildroot}" -a "%{buildroot}" != "/" ] && %__rm -rf "%{buildroot}"
@@ -104,6 +133,8 @@
 %{_datadir}/man/fr/man1/%{name}.1.gz
 
 %changelog
+* Sun Jul  4 2021 Rui Nuno Capela <rncbc@rncbc.org> 0.9.4
+- Early-Summer'21 release.
 * Tue May 11 2021 Rui Nuno Capela <rncbc@rncbc.org> 0.9.3
 - Spring'21 release.
 * Sun Mar 14 2021 Rui Nuno Capela <rncbc@rncbc.org> 0.9.2