From 0df566f62a18c8682c585e6a15169030e1f2bc12 Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Nov 24 2023 18:13:38 +0000 Subject: Add Qt6 build --- diff --git a/kdsoap.spec b/kdsoap.spec index 2eb1379..f25dd92 100644 --- a/kdsoap.spec +++ b/kdsoap.spec @@ -19,12 +19,15 @@ Source2: https://www.kdab.com/kdab-products.asc BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt6Core) BuildRequires: gnupg2 -%description +%global _description %{expand: KDSoap can be used to create client applications for web services and also provides the means to create web services without the need -for any further component such as a dedicated web server. +for any further component such as a dedicated web server.} + +%description %{_description} For more information, see https://www.kdab.com/development-resources/qt-tools/kd-soap/ @@ -32,11 +35,22 @@ https://www.kdab.com/development-resources/qt-tools/kd-soap/ %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} - %description devel This package contains header files and associated tools and libraries to develop programs which need to access web services using the SOAP protocol. +%package -n kdsoap6 +Summary: Qt 6 version of %{name} +%description -n kdsoap6 +%{_description} + +%package -n kdsoap6-devel +Summary: Development files for kdsoap6 +Requires: kdsoap6%{?_isa} = %{version}-%{release} +%description -n kdsoap6-devel +This package contains header files and associated tools and libraries to +develop programs which need to access web services using the SOAP protocol. + %package doc Summary: Documentation for %{name} BuildArch: noarch @@ -48,18 +62,27 @@ Documentation for %{name} %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup - %build -%cmake -DCMAKE_BUILD_TYPE=Release -DKDSoap_EXAMPLES=false +%global _vpath_builddir %{_target_platform}-qt5 +%cmake -DKDSoap_EXAMPLES=false -DKDSoap_QT6=OFF %cmake_build +%global _vpath_builddir %{_target_platform}-qt6 +%cmake -DKDSoap_EXAMPLES=false -DKDSoap_QT6=ON +%cmake_build %install +%global _vpath_builddir %{_target_platform}-qt5 %cmake_install -rm -rf $RPM_BUILD_ROOT/%{_datarootdir}/doc/KDSoap +%global _vpath_builddir %{_target_platform}-qt6 +%cmake_install +rm -rf $RPM_BUILD_ROOT/%{_datarootdir}/doc/KDSoap{,-qt6} %check +%global _vpath_builddir %{_target_platform}-qt5 +%ctest +%global _vpath_builddir %{_target_platform}-qt6 %ctest @@ -69,6 +92,12 @@ rm -rf $RPM_BUILD_ROOT/%{_datarootdir}/doc/KDSoap %doc README.md %license LICENSES/MIT.txt +%files -n kdsoap6 +%{_libdir}/libkdsoap-server-qt6.so.2* +%{_libdir}/libkdsoap-qt6.so.2* +%doc README.md +%license LICENSES/MIT.txt + %files devel %doc kdsoap.pri kdwsdl2cpp.pri %dir %{_datadir}/mkspecs @@ -80,7 +109,20 @@ rm -rf $RPM_BUILD_ROOT/%{_datarootdir}/doc/KDSoap %{_libdir}/libkdsoap.so %{_bindir}/kdwsdl2cpp %{_libdir}/cmake/KDSoap/ -%{_libdir}/qt5/mkspecs/modules/ +%{_libdir}/qt5/mkspecs/modules/* + +%files -n kdsoap6-devel +%doc kdsoap.pri kdwsdl2cpp.pri +%dir %{_datadir}/mkspecs +%dir %{_datadir}/mkspecs/features +%{_datadir}/mkspecs/features/kdsoap.prf +%{_includedir}/KDSoapClient/ +%{_includedir}/KDSoapServer/ +%{_libdir}/libkdsoap-server-qt6.so +%{_libdir}/libkdsoap-qt6.so +%{_bindir}/kdwsdl2cpp-qt6 +%{_libdir}/cmake/KDSoap-qt6/ +%{_libdir}/qt6/mkspecs/modules/* %files doc %doc docs