diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 879f770..15a9c5b 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -5,6 +5,11 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') +# No libmanette in RHEL +%if !0%{?rhel} +%global with_gampad 1 +%endif + # Build documentation by default (use `rpmbuild --without docs` to override it). # This is used by Coverity. Coverity injects custom compiler warnings, but # any warning during WebKit docs build is fatal! @@ -12,7 +17,7 @@ Name: webkit2gtk3 Version: 2.31.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -76,7 +81,9 @@ BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxslt) +%if 0%{?with_gamepad} BuildRequires: pkgconfig(manette-0.2) +%endif BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(wayland-client) @@ -208,6 +215,9 @@ rm -rf Source/ThirdParty/qunit/ %if %{with docs} -DENABLE_GTKDOC=ON \ %endif +%if !0%{?with_gamepad} + -DENABLE_GAMEPAD=OFF \ +%endif %if 0%{?fedora} -DUSER_AGENT_BRANDING="Fedora" \ %endif @@ -296,7 +306,10 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog -* Tue Jan 12 2020 Michael Catanzaro - 2.31.1-1 +* Wed Jan 13 2021 Michael Catanzaro - 2.31.1-2 +- Disable gamepad support in RHEL + +* Tue Jan 12 2021 Michael Catanzaro - 2.31.1-1 - Update to 2.31.1 * Tue Dec 15 2020 Michael Catanzaro - 2.30.4-1