From 264ff04e4918a3e837a8a5804ed51edf79e13349 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 18 Apr 2018 14:45:40 +0200 Subject: [PATCH] Remove wayland conditionals RHEL 7.4 and later now have wayland. --- clutter.spec | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/clutter.spec b/clutter.spec index 0cb799f..be9b4c1 100644 --- a/clutter.spec +++ b/clutter.spec @@ -1,9 +1,5 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") -%if 0%{?fedora} -%global with_wayland 1 -%endif - %global with_tests 1 %global glib2_version 2.44.0 @@ -14,7 +10,7 @@ Name: clutter Version: 1.26.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Open Source software library for creating rich graphical user interfaces License: LGPLv2+ @@ -36,23 +32,19 @@ BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(xi) BuildRequires: mesa-libGL-devel BuildRequires: systemd-devel -%if 0%{?with_wayland} BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libinput) >= %{libinput_version} BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xkbcommon) -%endif Requires: cairo%{?_isa} >= %{cairo_version} Requires: cogl%{?_isa} >= %{cogl_version} Requires: glib2%{?_isa} >= %{glib2_version} Requires: gobject-introspection Requires: json-glib%{?_isa} >= %{json_glib_version} -%if 0%{?with_wayland} Requires: libinput%{?_isa} >= %{libinput_version} -%endif %description Clutter is an open source software library for creating fast, @@ -98,12 +90,10 @@ the functionality of the installed clutter package. --enable-xinput \ --enable-gdk-backend \ %{?with_tests:--enable-installed-tests} \ -%if 0%{?with_wayland} --enable-egl-backend \ --enable-evdev-input \ --enable-wayland-backend \ - --enable-wayland-compositor \ -%endif + --enable-wayland-compositor make %{?_smp_mflags} V=1 @@ -140,6 +130,9 @@ find %{buildroot} -name '*.la' -delete %endif %changelog +* Wed Apr 18 2018 Kalev Lember - 1.26.2-6 +- Remove wayland conditionals + * Wed Feb 07 2018 Fedora Release Engineering - 1.26.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild