commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2023-07-08 22:47:12
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.23466 (New)
Package is "qt6-macros"
Sat Jul 8 22:47:12 2023 rev:8 rq:1097547 version:20230629
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2023-04-05
21:36:42.814930958 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.23466/qt6-macros.changes
2023-07-08 22:47:18.327181867 +0200
@@ -1,0 +2,10 @@
+Wed Jun 28 16:20:06 UTC 2023 - Callum Farmer
+
+- Change %_qt6_libexecdir to %_libexecdir/qt6 (bsc#1174075)
+
+---
+Mon Jun 19 09:34:04 UTC 2023 - Christophe Marin
+
+- Use gcc12 by default on Leap 15
+
+---
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.QYHlUl/_old 2023-07-08 22:47:24.583219470 +0200
+++ /var/tmp/diff_new_pack.QYHlUl/_new 2023-07-08 22:47:24.587219495 +0200
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20221130
+Version:20230629
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.QYHlUl/_old 2023-07-08 22:47:24.675220023 +0200
+++ /var/tmp/diff_new_pack.QYHlUl/_new 2023-07-08 22:47:24.699220168 +0200
@@ -146,13 +146,13 @@
# _qt6_ shall be used in files sections
%_qt6_prefix %{_prefix}
%_qt6_libdir %{_libdir}
+%_qt6_libexecdir %{_libexecdir}/qt6
%_qt6_includedir %{_includedir}/qt6
%_qt6_sharedir%{_datadir}
%_qt6_archdatadir %{_qt6_libdir}/qt6
%_qt6_bindir %{_qt6_archdatadir}/bin
%_qt6_examplesdir %{_qt6_archdatadir}/examples
%_qt6_importsdir %{_qt6_archdatadir}/imports
-%_qt6_libexecdir %{_qt6_archdatadir}/libexec
%_qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs
%_qt6_pluginsdir %{_qt6_archdatadir}/plugins
%_qt6_qmldir %{_qt6_archdatadir}/qml
@@ -192,8 +192,8 @@
-G"Unix Makefiles" \\\
%endif \
%if 0%{?suse_version} == 1500 \
--DCMAKE_C_COMPILER:STRING=gcc-10 \\\
--DCMAKE_CXX_COMPILER:STRING=g++-10 \\\
+-DCMAKE_C_COMPILER:STRING=gcc-12 \\\
+-DCMAKE_CXX_COMPILER:STRING=g++-12 \\\
-DCMAKE_CXX_LINK_PIE_SUPPORTED:BOOL=ON \\\
%endif \
-DQT_DISABLE_RPATH:BOOL=ON \\\
commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2023-04-05 21:31:53
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.19717 (New)
Package is "qt6-macros"
Wed Apr 5 21:31:53 2023 rev:7 rq:1077329 version:20221130
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2022-04-20
16:55:53.058542021 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.19717/qt6-macros.changes
2023-04-05 21:36:42.814930958 +0200
@@ -1,0 +2,5 @@
+Wed Nov 30 10:45:38 UTC 2022 - Christophe Giboudeaux
+
+- Update the %_qt6_metatypesdir location to match upstream changes
+
+---
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.X99Til/_old 2023-04-05 21:36:43.282933629 +0200
+++ /var/tmp/diff_new_pack.X99Til/_new 2023-04-05 21:36:43.290933675 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-macros
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20220329
+Version:20221130
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.X99Til/_old 2023-04-05 21:36:43.362934085 +0200
+++ /var/tmp/diff_new_pack.X99Til/_new 2023-04-05 21:36:43.366934108 +0200
@@ -167,7 +167,7 @@
# Variables only used for packaging
%_qt6_cmakedir%{_qt6_libdir}/cmake
-%_qt6_metatypesdir%{_qt6_libdir}/metatypes
+%_qt6_metatypesdir%{_qt6_archdatadir}/metatypes
%_qt6_pkgconfigdir%{_qt6_libdir}/pkgconfig
#--
commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2022-04-20 16:55:38
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.1941 (New)
Package is "qt6-macros"
Wed Apr 20 16:55:38 2022 rev:6 rq:970794 version:20220329
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2022-02-07
23:40:00.193659151 +0100
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.1941/qt6-macros.changes
2022-04-20 16:55:53.058542021 +0200
@@ -1,0 +2,8 @@
+Tue Mar 29 16:42:39 UTC 2022 - Christophe Giboudeaux
+
+- Set CMAKE_MESSAGE_LOG_LEVEL in %cmake_qt6.
+ The Qt 6.3 build system sets it to 'NOTICE' for non-developers
+ builds, which doesn't permit finding missing build dependencies.
+- Define %_qt6_pkgconfigdir. Qt 6.4 will install pkgconfig files.
+
+--
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.cV08Hu/_old 2022-04-20 16:55:53.546542477 +0200
+++ /var/tmp/diff_new_pack.cV08Hu/_new 2022-04-20 16:55:53.550542481 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-macros
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20220207
+Version:20220329
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.cV08Hu/_old 2022-04-20 16:55:53.598542526 +0200
+++ /var/tmp/diff_new_pack.cV08Hu/_new 2022-04-20 16:55:53.602542530 +0200
@@ -168,6 +168,7 @@
# Variables only used for packaging
%_qt6_cmakedir%{_qt6_libdir}/cmake
%_qt6_metatypesdir%{_qt6_libdir}/metatypes
+%_qt6_pkgconfigdir%{_qt6_libdir}/pkgconfig
#--
@@ -182,6 +183,7 @@
%cmake_qt6 \
cmake -DCMAKE_BUILD_TYPE:STRING=%{__qt6_build_type} \\\
-DCMAKE_INSTALL_PREFIX:STRING=%{_qt6_prefix} \\\
+-DCMAKE_MESSAGE_LOG_LEVEL:STRING=STATUS \\\
-S %__qt6_sourcedir \\\
-B %__qt6_builddir \\\
%if "%__qt6_build_tool" == "%__ninja" \
commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2022-02-07 23:38:25
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.1898 (New)
Package is "qt6-macros"
Mon Feb 7 23:38:25 2022 rev:5 rq:952239 version:20220207
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2021-10-04
18:41:06.642169192 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.1898/qt6-macros.changes
2022-02-07 23:40:00.193659151 +0100
@@ -1,0 +2,6 @@
+Mon Feb 7 13:47:05 UTC 2022 - Christophe Giboudeaux
+
+- Ensure PIE flags are passed to the linker on Leap to work around
+ an issue caused by GCC packaging (boo#1195628)
+
+---
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.h7ZkYp/_old 2022-02-07 23:40:00.601656359 +0100
+++ /var/tmp/diff_new_pack.h7ZkYp/_new 2022-02-07 23:40:00.605656332 +0100
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20210610
+Version:20220207
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.h7ZkYp/_old 2022-02-07 23:40:00.653656003 +0100
+++ /var/tmp/diff_new_pack.h7ZkYp/_new 2022-02-07 23:40:00.653656003 +0100
@@ -174,6 +174,11 @@
%qt6_use_make %global __qt6_build_tool %__make
#--
+# NOTE:
+# Due to how gcc-pie is packaged, the PIE flags are only
+# recognized by the default compiler (boo#1195628)
+# We can't rely on the check_pie_supported() function. That's
+# why CMAKE_CXX_LINK_PIE_SUPPORTED is enabled
%cmake_qt6 \
cmake -DCMAKE_BUILD_TYPE:STRING=%{__qt6_build_type} \\\
-DCMAKE_INSTALL_PREFIX:STRING=%{_qt6_prefix} \\\
@@ -187,6 +192,7 @@
%if 0%{?suse_version} == 1500 \
-DCMAKE_C_COMPILER:STRING=gcc-10 \\\
-DCMAKE_CXX_COMPILER:STRING=g++-10 \\\
+-DCMAKE_CXX_LINK_PIE_SUPPORTED:BOOL=ON \\\
%endif \
-DQT_DISABLE_RPATH:BOOL=ON \\\
-DCMAKE_C_FLAGS:STRING="%{optflags}" \\\
commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2021-10-04 18:39:55
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.2443 (New)
Package is "qt6-macros"
Mon Oct 4 18:39:55 2021 rev:4 rq:922686 version:20210610
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2021-05-10
15:41:10.373134842 +0200
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.2443/qt6-macros.changes
2021-10-04 18:41:06.642169192 +0200
@@ -1,0 +2,21 @@
+Thu Sep 16 14:07:45 UTC 2021 - Christophe Giboudeaux
+
+- Update to 6.2.0-rc
+
+---
+Thu Jun 10 06:49:18 UTC 2021 - Christophe Giboudeaux
+
+- Simplify the %cmake_qt6 macro.
+ QtBuildInternalsExtra.cmake, installed by qt6-base-common-devel
+ sets a couple variables and installation directories. We only
+ need to define those when building qt6-base. With this change,
+ CMake will stop reporting unused variables are defined when
+ building 3rd party packages (except QT_DISABLE_RPATH).
+- Remove extra escaping in macros.qt6.
+
+---
+Sun Jun 6 13:22:20 UTC 2021 - Christophe Giboudeaux
+
+- Work around QTBUG-93100 and use GCC 10 for Leap 15.2 and 15.3.
+
+---
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.nRKhDe/_old 2021-10-04 18:41:07.202170102 +0200
+++ /var/tmp/diff_new_pack.nRKhDe/_new 2021-10-04 18:41:07.206170108 +0200
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20210301
+Version:20210610
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.nRKhDe/_old 2021-10-04 18:41:07.250170180 +0200
+++ /var/tmp/diff_new_pack.nRKhDe/_new 2021-10-04 18:41:07.250170180 +0200
@@ -175,8 +175,8 @@
#--
%cmake_qt6 \
- cmake -DCMAKE_BUILD_TYPE=%{__qt6_build_type} \\\
--DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
+ cmake -DCMAKE_BUILD_TYPE:STRING=%{__qt6_build_type} \\\
+-DCMAKE_INSTALL_PREFIX:STRING=%{_qt6_prefix} \\\
-S %__qt6_sourcedir \\\
-B %__qt6_builddir \\\
%if "%__qt6_build_tool" == "%__ninja" \
@@ -184,30 +184,16 @@
%else \
-G"Unix Makefiles" \\\
%endif \
--DINSTALL_ARCHDATADIR=%{_qt6_archdatadir} \\\
--DINSTALL_BINDIR=%{_qt6_bindir} \\\
--DINSTALL_DATADIR=%{_qt6_datadir} \\\
--DINSTALL_DESCRIPTIONSDIR=%{_qt6_descriptionsdir} \\\
--DINSTALL_DOCDIR=%{_qt6_docdir} \\\
--DINSTALL_EXAMPLESDIR=%{_qt6_examplesdir} \\\
--DINSTALL_INCLUDEDIR=%{_qt6_includedir} \\\
--DINSTALL_LIBDIR=%{_qt6_libdir} \\\
--DINSTALL_LIBEXECDIR=%{_qt6_libexecdir} \\\
--DINSTALL_MKSPECSDIR=%{_qt6_mkspecsdir} \\\
--DINSTALL_PLUGINSDIR=%{_qt6_pluginsdir} \\\
--DINSTALL_QMLDIR=%{_qt6_qmldir} \\\
--DINSTALL_SYSCONFDIR=%{_qt6_sysconfdir} \\\
--DINSTALL_TESTSDIR=%{_qt6_testsdir} \\\
--DINSTALL_TRANSLATIONSDIR=%{_qt6_translationsdir} \\\
--DBUILD_WITH_PCH=FALSE \\\
--DQT_BUILD_EXAMPLES=TRUE \\\
--DQT_BUILD_TESTS=FALSE \\\
--DQT_DISABLE_RPATH=TRUE \\\
--DCMAKE_C_FLAGS="%{optflags}" \\\
--DCMAKE_CXX_FLAGS="%{optflags}" \\\
--DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\
--DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\
--DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined"
+%if 0%{?suse_version} == 1500 \
+-DCMAKE_C_COMPILER:STRING=gcc-10 \\\
+-DCMAKE_CXX_COMPILER:STRING=g++-10 \\\
+%endif \
+-DQT_DISABLE_RPATH:BOOL=ON \\\
+-DCMAKE_C_FLAGS:STRING="%{optflags}" \\\
+-DCMAKE_CXX_FLAGS:STRING="%{optflags}" \\\
+-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,--as-needed -Wl,--no-undefined"
\\\
+-DCMAKE_MODULE_LINKER_FLAGS:STRING="-Wl,--as-needed
-Wl,--no-undefined" \\\
+-DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,--as-needed -Wl,--no-undefined"
#--
@@ -219,7 +205,7 @@
%if %{qt6_docs_flavor} \
%{qt6_build_docs} \
%else \
-cmake --build \\%{__qt6_build_options} -v \
+cmake --build %{__qt6_build_options} -v \
%endif
#--
@@ -230,7 +216,7 @@
%qt6_build_docs \
export QT_QPA_PLUGIN_PATH="%{_qt6_pluginsdir}/platforms" \
export QT_PLUGIN_PATH=
commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2021-05-10 15:38:39
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.2988 (New)
Package is "qt6-macros"
Mon May 10 15:38:39 2021 rev:3 rq:891892 version:20210301
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2021-03-17
20:15:42.190968826 +0100
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.2988/qt6-macros.changes
2021-05-10 15:41:10.373134842 +0200
@@ -1,0 +2,6 @@
+Mon Mar 1 10:14:41 UTC 2021 - Christophe Giboudeaux
+
+- Remove the module name from the docs build targets.
+ The modules now have 'docs' and 'install_docs' build targets.
+
+---
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.s8bdEP/_old 2021-05-10 15:41:10.805133152 +0200
+++ /var/tmp/diff_new_pack.s8bdEP/_new 2021-05-10 15:41:10.809133137 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qt6-macros
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20210111
+Version:20210301
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.s8bdEP/_old 2021-05-10 15:41:10.853132965 +0200
+++ /var/tmp/diff_new_pack.s8bdEP/_new 2021-05-10 15:41:10.857132949 +0200
@@ -230,7 +230,7 @@
%qt6_build_docs \
export QT_QPA_PLUGIN_PATH="%{_qt6_pluginsdir}/platforms" \
export QT_PLUGIN_PATH="%{_qt6_pluginsdir}" \
- cmake --build \\%{__qt6_build_options} -t docs_qt%{__qt6_module_name} \
+ cmake --build \\%{__qt6_build_options} -t docs \
%{nil}
#--
@@ -251,7 +251,7 @@
#--
%qt6_install_docs \
- DESTDIR=%{buildroot} cmake --build \\%{__qt6_build_options} -t
install_docs_qt%{__qt6_module_name} \
+ DESTDIR=%{buildroot} cmake --build \\%{__qt6_build_options} -t install_docs \
# in Qt 6.0.0, %%{_qt6_docdir}/*.qch are folders which contain \
# files with the same name. \
# Starting with 6.0.1, the file is installed in %%{_qt6_docdir} directly. \
commit qt6-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-macros for openSUSE:Factory
checked in at 2021-03-17 20:14:08
Comparing /work/SRC/openSUSE:Factory/qt6-macros (Old)
and /work/SRC/openSUSE:Factory/.qt6-macros.new.2401 (New)
Package is "qt6-macros"
Wed Mar 17 20:14:08 2021 rev:2 rq:869497 version:20210111
Changes:
--- /work/SRC/openSUSE:Factory/qt6-macros/qt6-macros.changes2020-12-18
19:58:34.834010674 +0100
+++ /work/SRC/openSUSE:Factory/.qt6-macros.new.2401/qt6-macros.changes
2021-03-17 20:15:42.190968826 +0100
@@ -1,0 +2,9 @@
+Mon Jan 11 15:06:44 UTC 2021 - Christophe Giboudeaux
+
+- Add a %pre scriplet for QCH doc packages.
+ Starting with 6.0.1, the qch files are installed directly into %_qt6_docdir
+ instead of %_qt6_docdir/.qch/.
+ RPM can't upgrade packages if a directory is replaced by something
+ else, we need a %pre scriptlet that will remove existing folders.
+
+---
Other differences:
--
++ qt6-macros.spec ++
--- /var/tmp/diff_new_pack.kGrvNN/_old 2021-03-17 20:15:42.994969924 +0100
+++ /var/tmp/diff_new_pack.kGrvNN/_new 2021-03-17 20:15:42.998969930 +0100
@@ -17,7 +17,7 @@
Name: qt6-macros
-Version:20201210
+Version:20210111
Release:0
Summary:RPM macros for Qt6 packages
License:MIT
++ macros.qt6 ++
--- /var/tmp/diff_new_pack.kGrvNN/_old 2021-03-17 20:15:43.046969995 +0100
+++ /var/tmp/diff_new_pack.kGrvNN/_new 2021-03-17 20:15:43.050970001 +0100
@@ -252,6 +252,16 @@
%qt6_install_docs \
DESTDIR=%{buildroot} cmake --build \\%{__qt6_build_options} -t
install_docs_qt%{__qt6_module_name} \
+ # in Qt 6.0.0, %%{_qt6_docdir}/*.qch are folders which contain \
+ # files with the same name. \
+ # Starting with 6.0.1, the file is installed in %%{_qt6_docdir} directly. \
+ # We need a %%pre scriptlet to remove the old folder before upgrading. \
+ _current_dir=`pwd` \
+ pushd %{buildroot}%{_qt6_docdir} \
+ for qch_file in *.qch ; do \
+echo "if [ -d %{_qt6_docdir}/${qch_file} ] ; then rm -r
%{_qt6_docdir}/${qch_file} ; fi" >> ${_current_dir}/qch.pre \
+ done \
+ popd \
%{nil}
#--
@@ -287,6 +297,8 @@
%description -n %{__qt6_doc_package_name}-qch \
This package contains documentation for %{name} in QCH format. \
\
+%pre -n %{__qt6_doc_package_name}-qch -f qch.pre \
+\
%files -n %{__qt6_doc_package_name}-html \
%dir %{_qt6_docdir} \
%{_qt6_docdir}/* \
