diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 12f0a5e..5ae0542 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -1,22 +1,24 @@ %define majver %(echo %version | cut -d. -f1-2) -%define _qt6_prefix %{_libdir}/qt6 -%define _qt6_bindir %{_qt6_prefix}/bin -%define _qt6_datadir %{_datadir}/qt6 +%define _qt6_prefix %{_prefix} %define _qt6_archdatadir %{_libdir}/qt6 -%define _qt6_demosdir %{_qt6_prefix}/demos +%define _qt6_bindir %{_libdir}/qt6/bin +%define _qt6_datadir %{_datadir}/qt6 %define _qt6_docdir %{_docdir}/qt6 -%define _qt6_examplesdir %{_qt6_docdir}/examples +%define _qt6_examplesdir %{_qt6_archdatadir}/examples %define _qt6_headerdir %{_includedir}/qt6 +%define _qt6_includedir %{_includedir}/qt6 +%define _qt6_importdir %{_qt6_archdatadir}/imports %define _qt6_libdir %{_libdir} -%define _qt6_libexecdir %{_qt6_prefix}/libexec -%define _qt6_mkspecsdir %{_qt6_prefix}/mkspecs -%define _qt6_plugindir %{_qt6_prefix}/plugins +%define _qt6_libexecdir %{_qt6_archdatadir}/libexec +%define _qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs +%define _qt6_plugindir %{_qt6_archdatadir}/plugins +%define _qt6_qmldir %{_qt6_archdatadir}/qml %define _qt6_sysconfdir %{_sysconfdir}/xdg -%define _qt6_translationdir %{_qt6_datadir}/translations +%define _qt6_translationdir %{_datadir}/qt6/translations Name: qt6-qtbase Version: 6.6.1 -Release: 2mamba +Release: 3mamba Summary: A multiplatform, C++ GUI application development framework Group: System/Libraries Vendor: openmamba @@ -338,6 +340,9 @@ This package contains the SQLite plugin. %debug_package +# Don't clean build at the end +%global __spec_rmbuild_cmd /bin/true + %prep %setup -q -n qtbase-everywhere-src-%{version} #-D -T @@ -347,9 +352,9 @@ This package contains the SQLite plugin. #:<< _EOF cmake -B build \ -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \ -DINSTALL_BINDIR=%{_qt6_bindir} \ - -DINSTALL_LIBDIR=%{_libdir} \ + -DINSTALL_LIBDIR=%{_qt6_libdir} \ -DINSTALL_LIBEXECDIR=%{_qt6_libexecdir} \ -DINSTALL_ARCHDATADIR=%{_qt6_archdatadir} \ -DINSTALL_DATADIR=%{_qt6_datadir} \ @@ -357,7 +362,9 @@ cmake -B build \ -DINSTALL_SYSCONFDIR=%{_qt6_sysconfdir} \ -DINSTALL_EXAMPLESDIR=%{_qt6_examplesdir} \ -DINSTALL_INCLUDEDIR=%{_qt6_headerdir} \ + -DINSTALL_IMPORTDIR=%{_qt6_importdir} \ -DINSTALL_PLUGINSDIR=%{_qt6_plugindir} \ + -DINSTALL_QMLDIR=%{_qt6_qmldir} \ -DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \ -DINSTALL_MKSPECSDIR=%{_qt6_mkspecsdir} \ -DQT_BUILD_EXAMPLES=FALSE \ @@ -432,20 +439,22 @@ echo "\ %%_qt6_version %{version} %%_qt6_evr %{evr} %%_qt6_prefix %%{_libdir}/qt6 -%%_qt6_archdatadir %%{_libdir} -%%_qt6_bindir %%{_qt6_prefix}/bin +%%_qt6_archdatadir %%{_libdir}/qt6 +%%_qt6_bindir %%{_libdir}/qt6/bin %%_qt6_datadir %%{_datadir}/qt6 -%%_qt6_demosdir %%{_qt6_prefix}/demos -%%_qt6_docdir %%{_qt6_datadir}/doc -%%_qt6_examplesdir %%{_qt6_prefix}/examples +%%_qt6_docdir %%{_docdir}/qt6 +%%_qt6_examplesdir %%{_qt6_archdatadir}/examples %%_qt6_headerdir %%{_includedir}/qt6 +%%_qt6_includedir %%{_includedir}/qt6 +%%_qt6_importdir %%{_qt6_archdatadir}/imports %%_qt6_libdir %%{_libdir} -%%_qt6_libexecdir %%{_qt6_prefix}/libexec -%%_qt6_mkspecsdir %%{_qt6_prefix}/mkspecs -%%_qt6_plugindir %%{_qt6_prefix}/plugins +%%_qt6_libexecdir %%{_qt6_archdatadir}/libexec +%%_qt6_mkspecsdir %%{_qt6_archdatadir}/mkspecs +%%_qt6_plugindir %%{_qt6_archdatadir}/plugins +%%_qt6_qmldir %%{_qt6_archdatadir}/qml %%_qt6_qmake %%{_qt6_bindir}/qmake %%_qt6_sysconfdir %%{_sysconfdir}/xdg -%%_qt6_translationdir %%{_qt6_datadir}/translations" \ +%%_qt6_translationdir %%{_datadir}/qt6/translations" \ > %{buildroot}%{_rpmmacrodir}/macros.qt6 %clean @@ -634,6 +643,9 @@ echo "\ %{_qt6_plugindir}/sqldrivers/libqsqlite.so %changelog +* Sat Jan 13 2024 Silvan Calarco 6.6.1-3mamba +- updated rpm macros file + * Tue Jan 02 2024 Silvan Calarco 6.6.1-2mamba - libQt6DBus: move biarch conflicting binaries to -devel subpackage