Compare commits

..

No commits in common. 'c10-beta' and 'epel9' have entirely different histories.

@ -1,92 +0,0 @@
# SPDX-License-Identifier: MIT
%_qt6_build_type RelWithDebInfo
%_qt6_build_tool ninja
%_qt6_prefix %{_prefix}
%_qt6_archdatadir %{_libdir}/qt6
%_qt6_bindir %{_libdir}/qt6/bin
%_qt6_datadir %{_datadir}/qt6
%_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_archdatadir}/libexec
%_qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs
%_qt6_plugindir %{_qt6_archdatadir}/plugins
%_qt6_qmldir %{_qt6_archdatadir}/qml
%_qt6_qmake @@QMAKE@@
%_qt6_settingsdir %{_sysconfdir}/xdg
%_qt6_sysconfdir %{_qt6_settingsdir}
%_qt6_translationdir %{_datadir}/qt6/translations
%_qt6_cflags %{nil}@@QT6_CFLAGS@@
%_qt6_cxxflags %{nil}@@QT6_CXXFLAGS@@
%_qt6_ldflags %{nil}%{?__global_ldflags} @@QT6_RPM_LD_FLAGS@@
%_qt6_optflags %{optflags} @@QT6_RPM_OPT_FLAGS@@
%_qt6_qmake_flags \\\
QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt6_optflags} %{?_qt6_cflags}}" \\\
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt6_optflags} %{?_qt6_cflags}}" \\\
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt6_optflags} %{?_qt6_cxxflags}}" \\\
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt6_optflags} %{?_qt6_cxxflags}}" \\\
QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt6_ldflags}}" \\\
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt6_ldflags}}" \\\
QMAKE_STRIP=
%qmake_qt6 %{_qt6_qmake} %{?_qt6_qmake_flags}
%qmake_qt6_wrapper @@QMAKE_QT6_WRAPPER@@
%cmake_qt6 \
%cmake -DCMAKE_BUILD_TYPE=%{_qt6_build_type} \\\
-DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
%if "%_qt6_build_tool" == "ninja" \
-GNinja \\\
%else \
-G"Unix Makefiles" \\\
%endif \
-DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
-DINSTALL_ARCHDATADIR=%{_qt6_archdatadir} \\\
-DINSTALL_BINDIR=%{_qt6_bindir} \\\
-DINSTALL_LIBDIR=%{_qt6_libdir} \\\
-DINSTALL_LIBEXECDIR=%{_qt6_libexecdir} \\\
-DINSTALL_DATADIR=%{_qt6_datadir} \\\
-DINSTALL_DOCDIR=%{_qt6_docdir} \\\
-DINSTALL_INCLUDEDIR=%{_qt6_headerdir} \\\
-DINSTALL_EXAMPLESDIR=%{_qt6_examplesdir} \\\
-DINSTALL_MKSPECSDIR=%{_qt6_mkspecsdir} \\\
-DINSTALL_PLUGINSDIR=%{_qt6_plugindir} \\\
-DINSTALL_QMLDIR=%{_qt6_qmldir} \\\
-DINSTALL_SYSCONFDIR=%{_qt6_sysconfdir} \\\
-DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\
-DQT_DISABLE_RPATH=TRUE
%qt6_fix_tests \
pushd tests/auto \
find . -type f -name 'CMakeLists.txt' \\\
-exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}/\\\(.*\\\)|\\\1\\\2|' {} \\\; \\\
-exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}\\\(.*\\\)|\\\1.\\\2|' {} \\\; \
find . -type f \\\( -name '*.sh' -o -name '*.py' \\\) \\\
-exec sed -i 's|/usr/bin/python$|/usr/bin/python3|' {} \\\; \\\
-exec sed -i 's|/usr/bin/env\\\ python3*|/usr/bin/python3|' {} \\\; \\\
-exec sed -i 's|^/bin/sh$|!#/bin/sh|' {} \\\; \
popd \
%qt6_dont_autoinstall_tests \
sed -i 's|include(".*tests/cmake_install.cmake")||' %_vpath_srcdir/%_vpath_builddir/cmake_install.cmake \
%qt6_install_tests \
mkdir -p %{buildroot}%{_qt6_archdatadir}/tests \
pushd tests/auto \
find . -type f \\\
! -path '*/.*' \\\
-exec cp -r --parents {} %{buildroot}%{_qt6_archdatadir}/tests \\\; \ \
popd \
pushd %_vpath_srcdir/%_vpath_builddir/tests/auto \
find . -type f -executable \\\
-exec chrpath --delete {} \\\; \\\
-exec cp -r --parents {} %{buildroot}%{_qt6_archdatadir}/tests \\\; \
popd \

@ -0,0 +1,65 @@
# SPDX-License-Identifier: MIT
%_qt6_build_type RelWithDebInfo
%_qt6_build_tool ninja
%_qt6_prefix %{_prefix}
%_qt6_archdatadir %{_libdir}/qt6
%_qt6_bindir %{_libdir}/qt6/bin
%_qt6_datadir %{_datadir}/qt6
%_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_archdatadir}/libexec
%_qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs
%_qt6_plugindir %{_qt6_archdatadir}/plugins
%_qt6_qmldir %{_qt6_archdatadir}/qml
%_qt6_qmake @@QMAKE@@
%_qt6_settingsdir %{_sysconfdir}/xdg
%_qt6_sysconfdir %{_qt6_settingsdir}
%_qt6_translationdir %{_datadir}/qt6/translations
%_qt6_cflags %{nil}@@QT6_CFLAGS@@
%_qt6_cxxflags %{nil}@@QT6_CXXFLAGS@@
%_qt6_ldflags %{nil}%{?__global_ldflags} @@QT6_RPM_LD_FLAGS@@
%_qt6_optflags %{optflags} @@QT6_RPM_OPT_FLAGS@@
%_qt6_qmake_flags \\\
QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt6_optflags} %{?_qt6_cflags}}" \\\
QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt6_optflags} %{?_qt6_cflags}}" \\\
QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt6_optflags} %{?_qt6_cxxflags}}" \\\
QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt6_optflags} %{?_qt6_cxxflags}}" \\\
QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt6_ldflags}}" \\\
QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt6_ldflags}}" \\\
QMAKE_STRIP=
%qmake_qt6 %{_qt6_qmake} %{?_qt6_qmake_flags}
%qmake_qt6_wrapper @@QMAKE_QT6_WRAPPER@@
%cmake_qt6 \
%cmake -DCMAKE_BUILD_TYPE=%{_qt6_build_type} \\\
-DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
%if "%_qt6_build_tool" == "ninja" \
-GNinja \\\
%else \
-G"Unix Makefiles" \\\
%endif \
-DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\
-DINSTALL_ARCHDATADIR=%{_qt6_archdatadir} \\\
-DINSTALL_BINDIR=%{_qt6_bindir} \\\
-DINSTALL_LIBDIR=%{_qt6_libdir} \\\
-DINSTALL_LIBEXECDIR=%{_qt6_libexecdir} \\\
-DINSTALL_DATADIR=%{_qt6_datadir} \\\
-DINSTALL_DOCDIR=%{_qt6_docdir} \\\
-DINSTALL_INCLUDEDIR=%{_qt6_headerdir} \\\
-DINSTALL_EXAMPLESDIR=%{_qt6_examplesdir} \\\
-DINSTALL_MKSPECSDIR=%{_qt6_mkspecsdir} \\\
-DINSTALL_PLUGINSDIR=%{_qt6_plugindir} \\\
-DINSTALL_QMLDIR=%{_qt6_qmldir} \\\
-DINSTALL_SYSCONFDIR=%{_qt6_sysconfdir} \\\
-DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\
-DQT_DISABLE_RPATH=TRUE

@ -1,8 +1,7 @@
Name: qt6
# This version MUST remain in sync with Qt6 versions!
Version: 6.7.1
Release: 4%{?dist}
Version: 6.6.2
Release: 1%{?dist}
Summary: Qt6 meta package
License: GPL-3.0-only
URL: https://getfedora.org/
@ -89,42 +88,19 @@ Requires: qt6-rpm-macros
%{summary}.
%package rpm-macros
Summary: RPM macros for building Qt6 and KDE Frameworks 6 packages
Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages
Requires: cmake >= 3
Requires: gcc-c++
Requires: chrpath
BuildArch: noarch
%description rpm-macros
%{summary}.
%package srpm-macros
Summary: RPM macros for source Qt6 packages
BuildArch: noarch
%description srpm-macros
%{summary}.
%package filesystem
Summary: Filesystem for Qt6 packages
%description filesystem
Filesystem for Qt 6 packages.
%install
# See macros.qt6 where the directories are specified
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/bin
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/cmake
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/examples
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/imports
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/metatypes
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/modules
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/libexec
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/mkspecs
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/plugins
mkdir -p %{buildroot}%{_prefix}/{lib,%{_lib}}/qt6/qml
mkdir -p %{buildroot}%{_datadir}/qt6
mkdir -p %{buildroot}%{_docdir}/qt6
mkdir -p %{buildroot}%{_includedir}/qt6
mkdir -p %{buildroot}%{_datadir}/qt6/translations
install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.qt6
install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.qt6-srpm
install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt6.sh
@ -170,66 +146,10 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
%files srpm-macros
%{_rpmmacrodir}/macros.qt6-srpm
%files filesystem
%dir %{_prefix}/lib/qt6
%dir %{_prefix}/%{_lib}/qt6
%dir %{_prefix}/lib/qt6/bin
%dir %{_prefix}/%{_lib}/qt6/bin
%dir %{_prefix}/lib/qt6/cmake
%dir %{_prefix}/%{_lib}/qt6/cmake
%dir %{_prefix}/lib/qt6/examples
%dir %{_prefix}/%{_lib}/qt6/examples
%dir %{_prefix}/lib/qt6/imports
%dir %{_prefix}/%{_lib}/qt6/imports
%dir %{_prefix}/lib/qt6/metatypes
%dir %{_prefix}/%{_lib}/qt6/metatypes
%dir %{_prefix}/lib/qt6/modules
%dir %{_prefix}/%{_lib}/qt6/modules
%dir %{_prefix}/lib/qt6/libexec
%dir %{_prefix}/%{_lib}/qt6/libexec
%dir %{_prefix}/lib/qt6/mkspecs
%dir %{_prefix}/%{_lib}/qt6/mkspecs
%dir %{_prefix}/lib/qt6/plugins
%dir %{_prefix}/%{_lib}/qt6/plugins
%dir %{_prefix}/lib/qt6/qml
%dir %{_prefix}/%{_lib}/qt6/qml
%dir %{_datadir}/qt6
%dir %{_docdir}/qt6
%dir %{_includedir}/qt6
%dir %{_datadir}/qt6/translations
%changelog
* Mon Jul 22 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-4
- Introduce qt6-filesystem package
Resolves: RHEL-50034
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 6.7.1-3
- Bump release for June 2024 mass rebuild
* Thu Jun 06 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-2
- %qt6_install_tests: also install source files
Resolves: RHEL-35968
* Fri May 31 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.1-1
- 6.7.1
Resolves: RHEL-36430
* Wed Apr 17 2024 Jan Grulich <jgrulich@redhat.com> - 6.7.0-1
- 6.7.0
Resolves: RHEL-32950
Resolves: RHEL-27845
* Wed Apr 10 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-8
- Adjust qt6_fix_tests macro to handle more cases
Resolves: RHEL-28239
* Tue Apr 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-7
- Replace patchelf with chrpath
Resolves: RHEL-28239
* Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-6
- Add macros to build and fix Qt unit tests
Resolves: RHEL-28239
* Sun Jan 28 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
- 6.6.2
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
Loading…
Cancel
Save