public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/mingw-qtkeychain] rawhide: Add qt6 build
@ 2026-08-16 10:18 Sandro Mani
  0 siblings, 0 replies; only message in thread
From: Sandro Mani @ 2026-08-16 10:18 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/mingw-qtkeychain
Branch : rawhide
Commit : ff2bba540115cade6ac7efb79e62b02a11b069c6
Author : Sandro Mani <manisandro@gmail.com>
Date   : 2026-08-16T12:18:33+02:00
Stats  : +49/-6 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/mingw-qtkeychain/c/ff2bba540115cade6ac7efb79e62b02a11b069c6?branch=rawhide

Log:
Add qt6 build

---
diff --git a/mingw-qtkeychain.spec b/mingw-qtkeychain.spec
index d1cf22c..6d19ce5 100644
--- a/mingw-qtkeychain.spec
+++ b/mingw-qtkeychain.spec
@@ -20,12 +20,16 @@ BuildRequires:  mingw32-gcc-c++
 BuildRequires:  mingw32-qt5-qtbase
 BuildRequires:  mingw32-qt5-qttools
 BuildRequires:  mingw32-qt5-qttools-tools
+BuildRequires:  mingw32-qt6-qtbase
+BuildRequires:  mingw32-qt6-qttools
 
 BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw64-gcc-c++
 BuildRequires:  mingw64-qt5-qtbase
 BuildRequires:  mingw64-qt5-qttools
 BuildRequires:  mingw64-qt5-qttools-tools
+BuildRequires:  mingw64-qt6-qtbase
+BuildRequires:  mingw64-qt6-qttools
 
 
 %description
@@ -33,18 +37,31 @@ MinGW Windows %{pkgname} library.
 
 
 %package -n mingw32-%{pkgname}-qt5
-Summary:       MinGW Windows %{pkgname} library
+Summary:       MinGW Windows %{pkgname} Qt5 library
 
 %description -n mingw32-%{pkgname}-qt5
-MinGW Windows %{pkgname} library.
+MinGW Windows %{pkgname} Qt5 library.
 
 
 %package -n mingw64-%{pkgname}-qt5
-Summary:       MinGW Windows %{pkgname} library
+Summary:       MinGW Windows %{pkgname} Qt5 library
 
 %description -n mingw64-%{pkgname}-qt5
-MinGW Windows %{pkgname} library.
+MinGW Windows %{pkgname} Qt5 library.
+
+
+%package -n mingw32-%{pkgname}-qt6
+Summary:       MinGW Windows %{pkgname} Qt6 library
+
+%description -n mingw32-%{pkgname}-qt6
+MinGW Windows %{pkgname} Qt6 library.
+
+
+%package -n mingw64-%{pkgname}-qt6
+Summary:       MinGW Windows %{pkgname} Qt6 library
 
+%description -n mingw64-%{pkgname}-qt6
+MinGW Windows %{pkgname} Qt6 library.
 
 %{?mingw_debug_package}
 
@@ -54,17 +71,27 @@ MinGW Windows %{pkgname} library.
 
 
 %build
-%mingw_cmake \
-    -DBUILD_WITH_QT4:BOOL=OFF
+export MINGW_BUILDDIR_SUFFIX=_qt5
+%mingw_cmake -DBUILD_WITH_QT5:BOOL=ON
+%mingw_make_build
+export MINGW_BUILDDIR_SUFFIX=_qt6
+export MINGW32_CMAKE_ARGS="-DECM_MKSPECS_INSTALL_DIR=%{mingw32_datadir}/qt6/mkspecs/modules"
+export MINGW64_CMAKE_ARGS="-DECM_MKSPECS_INSTALL_DIR=%{mingw64_datadir}/qt6/mkspecs/modules"
+%mingw_cmake -DBUILD_WITH_QT5:BOOL=OFF
 %mingw_make_build
 
 
 %install
+export MINGW_BUILDDIR_SUFFIX=_qt5
+%mingw_make_install
+export MINGW_BUILDDIR_SUFFIX=_qt6
 %mingw_make_install
 
 %find_lang %{pkgname} --with-qt
 grep %{mingw32_datadir}/qt5keychain/translations %{pkgname}.lang > mingw32_%{pkgname}-qt5.lang
 grep %{mingw64_datadir}/qt5keychain/translations %{pkgname}.lang > mingw64_%{pkgname}-qt5.lang
+grep %{mingw32_datadir}/qt6keychain/translations %{pkgname}.lang > mingw32_%{pkgname}-qt6.lang
+grep %{mingw64_datadir}/qt6keychain/translations %{pkgname}.lang > mingw64_%{pkgname}-qt6.lang
 
 
 
@@ -84,6 +111,22 @@ grep %{mingw64_datadir}/qt5keychain/translations %{pkgname}.lang > mingw64_%{pkg
 %{mingw64_libdir}/cmake/Qt5Keychain
 %{mingw64_datadir}/qt5/mkspecs/modules/qt_Qt5Keychain.pri
 
+%files -n mingw32-%{pkgname}-qt6 -f mingw32_%{pkgname}-qt6.lang
+%license COPYING
+%{mingw32_bindir}/libqt6keychain.dll
+%{mingw32_includedir}/qt6keychain/
+%{mingw32_libdir}/libqt6keychain.dll.a
+%{mingw32_libdir}/cmake/Qt6Keychain
+%{mingw32_datadir}/qt6/mkspecs/modules/qt_Qt6Keychain.pri
+
+%files -n mingw64-%{pkgname}-qt6 -f mingw64_%{pkgname}-qt6.lang
+%license COPYING
+%{mingw64_bindir}/libqt6keychain.dll
+%{mingw64_includedir}/qt6keychain/
+%{mingw64_libdir}/libqt6keychain.dll.a
+%{mingw64_libdir}/cmake/Qt6Keychain
+%{mingw64_datadir}/qt6/mkspecs/modules/qt_Qt6Keychain.pri
+
 %changelog
 * Sun Aug 16 2026 Sandro Mani <manisandro@gmail.com> - 0.17.0-1
 - Update to 0.17.0

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-16 10:18 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-16 10:18 [rpms/mingw-qtkeychain] rawhide: Add qt6 build Sandro Mani

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox