Compare commits

...

No commits in common. "imports/c8-beta/qt5-qtcanvas3d-5.11.1-2.el8" and "c8" have entirely different histories.

3 changed files with 54 additions and 4 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/qtcanvas3d-everywhere-src-5.11.1.tar.xz SOURCES/qtcanvas3d-everywhere-src-5.12.5.tar.xz

View File

@ -1 +1 @@
9fa2e596cd0742cdd0d22d807ac449f50a41893f SOURCES/qtcanvas3d-everywhere-src-5.11.1.tar.xz 699d4d5ed1e827df9e05bf0987482c7a77e01a25 SOURCES/qtcanvas3d-everywhere-src-5.12.5.tar.xz

View File

@ -1,15 +1,18 @@
%global qt_module qtcanvas3d %global qt_module qtcanvas3d
%global build_tests 1
Summary: Qt5 - Canvas3d component Summary: Qt5 - Canvas3d component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.11.1 Version: 5.12.5
Release: 2%{?dist} Release: 4%{?dist}
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
Url: http://www.qt.io Url: http://www.qt.io
%global majmin %(echo %{version} | cut -d. -f1-2) %global majmin %(echo %{version} | cut -d. -f1-2)
Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
BuildRequires: qt5-rpm-macros >= %{version}
BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-static BuildRequires: qt5-qtbase-static
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
@ -26,6 +29,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description examples %description examples
%{summary}. %{summary}.
%if 0%{?build_tests}
%package tests
Summary: Unit tests for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests
%{summary}.
%endif
%prep %prep
%setup -q -n %{qt_module}-everywhere-src-%{version} %setup -q -n %{qt_module}-everywhere-src-%{version}
@ -36,10 +48,27 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%make_build %make_build
%if 0%{?build_tests}
make sub-tests %{?_smp_mflags} -k ||:
%endif
%install %install
make install INSTALL_ROOT=%{buildroot} make install INSTALL_ROOT=%{buildroot}
%if 0%{?build_tests}
# Install tests for gating
mkdir -p %{buildroot}%{_qt5_libdir}/qt5
find ./tests -not -path '*/\.*' -type d | while read LINE
do
mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE"
done
find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE
do
cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/
done
%endif
%files %files
%license LICENSE.* %license LICENSE.*
@ -50,8 +79,29 @@ make install INSTALL_ROOT=%{buildroot}
%{_qt5_examplesdir}/canvas3d/ %{_qt5_examplesdir}/canvas3d/
%endif %endif
%if 0%{?build_tests}
%files tests
%{_qt5_libdir}/qt5/tests
%endif
%changelog %changelog
* Wed Apr 13 2022 Jan Grulich <jgrulich@redhat.com> - 5.12.5-4
- Rebuild for Qt 5.15.3
Resolves: bz#2074795
* Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.12.5-3
- Rebuild (binutils)
Resolves: bz#1930041
* Sun Apr 04 2021 Jan Grulich <jgrulich@redhat.com> - 5.12.5-2
- Rebuild for Qt 5.15.2
Resolves: bz#1930041
* Thu Nov 07 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5
Resolves: bz#1733136
* Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2 * Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
- Rebuild to fix CET notes - Rebuild to fix CET notes
Resolves: bz#1657233 Resolves: bz#1657233