Enable installed tests

Now that the file conflicts between gtk3 and gtk4 tests are fixed, we
can enable them again.
This commit is contained in:
Kalev Lember 2017-11-02 15:25:51 +01:00
parent 36a0dd29c0
commit da80b4a9ea

View File

@ -3,9 +3,6 @@
%global with_broadway 1 %global with_broadway 1
%endif %endif
# File conflicts between gtk3-tests and gtk4-tests
%global build_installed_tests 0
%global glib2_version 2.53.7 %global glib2_version 2.53.7
%global pango_version 1.37.3 %global pango_version 1.37.3
%global atk_version 2.15.1 %global atk_version 2.15.1
@ -143,7 +140,6 @@ Requires: gtk4 = %{version}-%{release}
This package contains developer documentation for version 4 of the GTK+ This package contains developer documentation for version 4 of the GTK+
widget toolkit. widget toolkit.
%if 0%{?build_installed_tests}
%package tests %package tests
Summary: Tests for the %{name} package Summary: Tests for the %{name} package
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
@ -151,7 +147,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description tests %description tests
The %{name}-tests package contains tests that can be used to verify The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package. the functionality of the installed %{name} package.
%endif
%prep %prep
%setup -q -n gtk+-%{version} %setup -q -n gtk+-%{version}
@ -174,11 +169,7 @@ export CFLAGS='-fno-strict-aliasing %optflags'
-Denable-colord=yes \ -Denable-colord=yes \
-Ddocumentation=true \ -Ddocumentation=true \
-Dman-pages=true \ -Dman-pages=true \
%if 0%{?build_installed_tests}
-Denable-installed-tests=true -Denable-installed-tests=true
%else
-Denable-installed-tests=false
%endif
%meson_build %meson_build
@ -311,15 +302,14 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || :
%files devel-docs %files devel-docs
%{_datadir}/gtk-doc %{_datadir}/gtk-doc
%if 0%{?build_installed_tests}
%files tests %files tests
%{_libexecdir}/installed-tests/gtk+ %dir %{_libexecdir}/installed-tests
%{_datadir}/installed-tests %{_libexecdir}/installed-tests/gtk-4.0/
%endif
%changelog %changelog
* Thu Nov 02 2017 Kalev Lember <klember@redhat.com> - 3.92.1-1 * Thu Nov 02 2017 Kalev Lember <klember@redhat.com> - 3.92.1-1
- Update to 3.92.1 - Update to 3.92.1
- Enable installed tests
* Tue Aug 08 2017 Kalev Lember <klember@redhat.com> - 3.91.2-1 * Tue Aug 08 2017 Kalev Lember <klember@redhat.com> - 3.91.2-1
- Update to 3.91.2 - Update to 3.91.2