From f6130eca775bda030aa5c769463fcf4fa11750e4 Mon Sep 17 00:00:00 2001 From: Benjamin A. Beasley Date: Mar 29 2021 15:57:55 +0000 Subject: Drop json-static workaround in Fedora 35+ --- diff --git a/giada.spec b/giada.spec index 8beeddc..52de479 100644 --- a/giada.spec +++ b/giada.spec @@ -6,7 +6,7 @@ Version: 0.17.2 %global rtaudio_version 5.1.0 # Commit hash for the bundled rtaudio fork, included as a git submodule: %global rtaudio_commit eca619244a6c045efc7f30473040d4f27aa96a6e -Release: 1%{?dist} +Release: 2%{?dist} Summary: Your hardcore loop machine # LICENSING NOTE: @@ -95,11 +95,12 @@ BuildRequires: pkgconfig(freetype2) %if 0%{?fedora} == 32 BuildRequires: json-devel%{?_isa} -BuildRequires: json-static %else BuildRequires: pkgconfig(nlohmann_json) -# Wait for https://bugzilla.redhat.com/show_bug.cgi?id=1944047 -# BuildRequires: json-static +%endif +# https://bugzilla.redhat.com/show_bug.cgi?id=1944047 +%if 0%{?fedora} != 33 && 0%{?fedora} == 34 +BuildRequires: json-static %endif %if %{with tests} @@ -243,6 +244,9 @@ xvfb-run -a %{buildroot}%{_bindir}/giada --run-tests %changelog +* Mon Mar 29 2021 Benjamin A. Beasley - 0.17.2-2 +- Drop json-static workaround in Fedora 35+ + * Sun Mar 28 2021 Benjamin A. Beasley - 0.17.2-1 - New upstream version 0.17.2 - Replace giada-0.17.1-fix-install-path.patch with setting CMAKE_INSTALL_PREFIX