clean some old cruft

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-08-25 12:02:33 +02:00
parent b6ac8de56f
commit fe8d31c4bd
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C

View File

@ -18,8 +18,8 @@ Patch0003: 0003-rpm-pass-auto-features-enabled-skip-ci.patch
BuildArch: noarch BuildArch: noarch
Obsoletes: %{name}-gui < 0.31.0-3 Obsoletes: %{name}-gui < 0.31.0-3
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python3-devel
BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python3-setuptools
%if %{with check} %if %{with check}
BuildRequires: ninja-build BuildRequires: ninja-build
# Various languages # Various languages
@ -32,25 +32,17 @@ BuildRequires: gcc-objc++
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: mono-core mono-devel BuildRequires: mono-core mono-devel
BuildRequires: rust BuildRequires: rust
# No ldc as of RHEL7 and on non-ldc arches
%if ! 0%{?rhel} || 0%{?rhel} > 7
# Since the build is noarch, we can't use %%ifarch # Since the build is noarch, we can't use %%ifarch
#%%ifarch %%{ldc_arches} #%%ifarch %%{ldc_arches}
#BuildRequires: ldc #BuildRequires: ldc
#%%endif #%%endif
%endif
# Various libs support # Various libs support
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: gtest-devel BuildRequires: gtest-devel
BuildRequires: gmock-devel BuildRequires: gmock-devel
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
BuildRequires: vala BuildRequires: vala
# In recent versions it's merged into vala
%if (0%{?rhel} && 0%{?rhel} <= 7)
BuildRequires: vala-tools
%else
BuildRequires: python3-gobject-base BuildRequires: python3-gobject-base
%endif
BuildRequires: wxGTK3-devel BuildRequires: wxGTK3-devel
BuildRequires: flex BuildRequires: flex
BuildRequires: bison BuildRequires: bison
@ -97,7 +89,7 @@ install -Dpm0644 data/macros.%{name} %{buildroot}%{rpmmacrodir}/macros.%{name}
%if %{with check} %if %{with check}
%check %check
export MESON_PRINT_TEST_OUTPUT=1 export MESON_PRINT_TEST_OUTPUT=1
%{__python3} ./run_tests.py %{?rhel:|| :} %{__python3} ./run_tests.py
%endif %endif
%files %files