Skip some tests known to fail, and declare package conflict
The test fail is a known issues that got removed when syncing with Fedora. The conflict is due to a move of licence files from doc to core package. Related: rhbz#1957948
This commit is contained in:
parent
a7f7b69689
commit
034c8a8f95
15
cmake.spec
15
cmake.spec
@ -65,7 +65,7 @@
|
||||
%{?rcsuf:%global versuf -%{rcsuf}}
|
||||
|
||||
# For handling bump release by rpmdev-bumpspec and mass rebuild
|
||||
%global baserelease 2
|
||||
%global baserelease 3
|
||||
|
||||
# Uncomment if building for EPEL
|
||||
#global name_suffix %%{major_version}
|
||||
@ -196,6 +196,9 @@ Requires: %{name}-filesystem%{?_isa} = %{version}-%{release}
|
||||
# Explicitly require make. (rhbz#1862014)
|
||||
Requires: make
|
||||
|
||||
# When license files moved from the doc package to main package.
|
||||
Conflicts: %{name}-doc <= 3.18.2
|
||||
|
||||
# Provide the major version name
|
||||
Provides: %{orig_name}%{major_version} = %{version}-%{release}
|
||||
|
||||
@ -443,6 +446,13 @@ NO_TEST="CTestTestUpload|CPackComponentsForAll-RPM-IgnoreGroup|CPack_RPM.DEBUGIN
|
||||
%ifarch s390x
|
||||
NO_TEST="$NO_TEST|kwsys.testProcess-4|kwsys.testProcess-5"
|
||||
%endif
|
||||
|
||||
# RunCMake.PrecompileHeaders test uses precompiled file presumably compiled with different compiler
|
||||
# that one of RHEL8 (GCC-8.3.1). See https://bugzilla.redhat.com/show_bug.cgi?id=1721553#c4
|
||||
%if 0%{?rhel} && 0%{?rhel} > 7
|
||||
NO_TEST="$NO_TEST|RunCMake.PrecompileHeaders"
|
||||
%endif
|
||||
|
||||
# curl test may fail during bootstrap
|
||||
%if %{with bootstrap}
|
||||
NO_TEST="$NO_TEST|curl"
|
||||
@ -519,6 +529,9 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 17 2021 sguelton@redhat.com - 3.20.2-3
|
||||
- Fix rhbz#1964392 and rhbz#1964407
|
||||
|
||||
* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 3.20.2-2
|
||||
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
||||
Related: rhbz#1971065
|
||||
|
Loading…
Reference in New Issue
Block a user