Remove wayland conditionals

RHEL 7.4 and later now have wayland.
This commit is contained in:
Kalev Lember 2018-04-18 14:45:40 +02:00
parent f76d84e258
commit 264ff04e49

View File

@ -1,9 +1,5 @@
%global _changelog_trimtime %(date +%s -d "1 year ago") %global _changelog_trimtime %(date +%s -d "1 year ago")
%if 0%{?fedora}
%global with_wayland 1
%endif
%global with_tests 1 %global with_tests 1
%global glib2_version 2.44.0 %global glib2_version 2.44.0
@ -14,7 +10,7 @@
Name: clutter Name: clutter
Version: 1.26.2 Version: 1.26.2
Release: 5%{?dist} Release: 6%{?dist}
Summary: Open Source software library for creating rich graphical user interfaces Summary: Open Source software library for creating rich graphical user interfaces
License: LGPLv2+ License: LGPLv2+
@ -36,23 +32,19 @@ BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xi)
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
%if 0%{?with_wayland}
BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(libinput) >= %{libinput_version} BuildRequires: pkgconfig(libinput) >= %{libinput_version}
BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbcommon)
%endif
Requires: cairo%{?_isa} >= %{cairo_version} Requires: cairo%{?_isa} >= %{cairo_version}
Requires: cogl%{?_isa} >= %{cogl_version} Requires: cogl%{?_isa} >= %{cogl_version}
Requires: glib2%{?_isa} >= %{glib2_version} Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gobject-introspection Requires: gobject-introspection
Requires: json-glib%{?_isa} >= %{json_glib_version} Requires: json-glib%{?_isa} >= %{json_glib_version}
%if 0%{?with_wayland}
Requires: libinput%{?_isa} >= %{libinput_version} Requires: libinput%{?_isa} >= %{libinput_version}
%endif
%description %description
Clutter is an open source software library for creating fast, Clutter is an open source software library for creating fast,
@ -98,12 +90,10 @@ the functionality of the installed clutter package.
--enable-xinput \ --enable-xinput \
--enable-gdk-backend \ --enable-gdk-backend \
%{?with_tests:--enable-installed-tests} \ %{?with_tests:--enable-installed-tests} \
%if 0%{?with_wayland}
--enable-egl-backend \ --enable-egl-backend \
--enable-evdev-input \ --enable-evdev-input \
--enable-wayland-backend \ --enable-wayland-backend \
--enable-wayland-compositor \ --enable-wayland-compositor
%endif
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
@ -140,6 +130,9 @@ find %{buildroot} -name '*.la' -delete
%endif %endif
%changelog %changelog
* Wed Apr 18 2018 Kalev Lember <klember@redhat.com> - 1.26.2-6
- Remove wayland conditionals
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.2-5 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.26.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild