Compare commits

..

No commits in common. "c9-beta" and "c8" have entirely different histories.
c9-beta ... c8

3 changed files with 29 additions and 98 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/qtscript-everywhere-opensource-src-5.15.9.tar.xz SOURCES/qtscript-everywhere-opensource-src-5.15.3.tar.xz

View File

@ -1 +1 @@
9cddbc54828728cd67987d5dd2ce3d2c0e1ce733 SOURCES/qtscript-everywhere-opensource-src-5.15.9.tar.xz 807861d243f31ab34d1b4051fd273206b2ab533e SOURCES/qtscript-everywhere-opensource-src-5.15.3.tar.xz

View File

@ -16,7 +16,7 @@
Summary: Qt5 - QtScript component Summary: Qt5 - QtScript component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.15.9 Version: 5.15.3
Release: 1%{?dist} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
@ -25,13 +25,9 @@ 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-opensource-src-%{version}.tar.xz Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
## upstream patches
## downstream patches
# add s390(x0 support to Platform.h (taken from webkit) # add s390(x0 support to Platform.h (taken from webkit)
Patch100: qtscript-everywhere-src-5.12.1-s390.patch Patch100: qtscript-everywhere-src-5.12.1-s390.patch
BuildRequires: make
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-private-devel BuildRequires: qt5-qtbase-private-devel
@ -75,24 +71,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%{summary}. %{summary}.
%endif %endif
%prep %prep
%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 %autosetup -n %{qt_module}-everywhere-src-%{version} -p1
#patch100 -p1 -b .s390
%build %build
# QT is known not to work properly with LTO at this point. Some of the issues
# are being worked on upstream and disabling LTO should be re-evaluated as
# we update this change. Until such time...
# Disable LTO
%define _lto_cflags %{nil}
# workaround serious failures when building with f28's gcc8 # workaround serious failures when building with f28's gcc8
# https://bugzilla.redhat.com/show_bug.cgi?id=1551246 # https://bugzilla.redhat.com/show_bug.cgi?id=1551246
#if 0%{?fedora} > 27 %if 0%{?fedora} > 27
%if 0
export CXXFLAGS="$RPM_OPT_FLAGS -O1" export CXXFLAGS="$RPM_OPT_FLAGS -O1"
%endif %endif
@ -101,15 +87,23 @@ export CXXFLAGS="$RPM_OPT_FLAGS -O1"
%make_build %make_build
%if 0%{?build_tests} %if 0%{?build_tests}
%qt5_build_tests make sub-tests %{?_smp_mflags} -k ||:
%endif %endif
%install %install
%make_install INSTALL_ROOT=%{buildroot} %make_install INSTALL_ROOT=%{buildroot}
%if 0%{?build_tests} %if 0%{?build_tests}
%qt5_install_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 %endif
## .prl file love (maybe consider just deleting these -- rex ## .prl file love (maybe consider just deleting these -- rex
@ -171,94 +165,31 @@ fi
%endif %endif
%changelog %changelog
* Tue Apr 18 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
- 5.15.9
Resolves: bz#2175745
* Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1 * Mon Mar 28 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
- 5.15.3 - 5.15.3
Resolves: bz#2061365 Resolves: bz#2061400
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-6 * Wed Apr 28 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuild (binutils)
Related: rhbz#1991688 Resolves: bz#1930051
* Wed Jun 09 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-5 * Sun Apr 04 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- Add gating tests
Resolves: bz#1968470
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.15.2-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Nov 24 07:54:15 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-2
- Rebuild for qtbase with -no-reduce-relocations option
* Fri Nov 20 09:30:46 CET 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.2-1
- 5.15.2 - 5.15.2
Resolves: bz#1930051
* Thu Sep 10 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1 * Mon Nov 18 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.15.1
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.14.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 5.14.2-2
- Disable LTO
* Sat Apr 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.14.2-1
- 5.14.2
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.13.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Dec 09 2019 Jan Grulich <jgrulich@redhat.com> - 5.13.2-1
- 5.13.2
* Tue Sep 24 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.5-1
- 5.12.5 - 5.12.5
Resolves: bz#1733147
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.12.4-2 * Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuild to fix CET notes
Resolves: bz#1657247
* Fri Jun 14 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.4-1 * Tue Jul 03 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-1
- 5.12.4
* Tue Jun 04 2019 Jan Grulich <jgrulich@redhat.com> - 5.12.3-1
- 5.12.3
* Wed May 22 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-2
- drop gcc8 workaround (#1550245)
* Fri Feb 15 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.12.1-1
- 5.12.1
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Dec 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.3-1
- 5.11.3
* Fri Sep 21 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.2-1
- 5.11.2
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.11.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.1-1
- 5.11.1 - 5.11.1
* Sat May 26 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.11.0-1 * Tue Jun 05 2018 Jan Grulich <jgrulich@redhat.com> - 5.10.1-4
- 5.11.0 - use timeout to avoid hanging tests and disable tests on aarch64
* Wed May 09 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-4
- %%check: use 'timeout 180' to avoid hanging tests
* Mon Mar 05 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-3 * Mon Mar 05 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.10.1-3
- support %%bootstrap, %%check: add autotests - support %%bootstrap, %%check: add autotests