- 2.018, add qt6 macros

diff --git a/macros.qt b/macros.qt
index 278cdb285b9d426242426069d868163abd56b600..bc6b34762a45cd2ebe5e22b10c46a27dbb4fd3a2 100644 (file)
--- a/macros.qt
+++ b/macros.qt
@@ -9,3 +9,15 @@
        QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%rpmldflags}" \\\
        QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%rpmldflags}" \\\
 %{nil}
+
+%_qt6_qmake    /usr/bin/qmake-qt6
+%qmake_qt6     %{_qt6_qmake} \\\
+       %{?__cc:QMAKE_CC="%{__cc}"} \\\
+       %{?__cxx:QMAKE_CXX="%{__cxx}"} \\\
+       QMAKE_CFLAGS_RELEASE="${CFLAGS:-%rpmcflags %rpmcppflags}" \\\
+       QMAKE_CFLAGS_DEBUG="${CFLAGS:-%rpmcflags %rpmcppflags}" \\\
+       QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%rpmcxxflags %rpmcppflags}" \\\
+       QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%rpmcxxflags %rpmcppflags}" \\\
+       QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%rpmldflags}" \\\
+       QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%rpmldflags}" \\\
+%{nil}

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 1c63bc19db1243d929cb791eda5cd371cc71afc8..f2c82043837ef3d5e3bdccecbc92c78ee5cd30ea 100644 (file)
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  2.017
+%define                rpm_macros_rev  2.018
 %define                find_lang_rev   1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define                prov_ver        4.15