From 21f1358874321250eead70b85c0c5cc13c90b8a7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Aug 10 2020 09:42:16 +0000 Subject: Resolves: rhbz#1560206 drop requirement on yajl --- diff --git a/raptor2.spec b/raptor2.spec index adb1d78..81ab5b2 100644 --- a/raptor2.spec +++ b/raptor2.spec @@ -2,7 +2,7 @@ Summary: RDF Parser Toolkit for Redland Name: raptor2 Version: 2.0.15 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ or LGPLv2+ or ASL 2.0 Source: http://download.librdf.org/source/raptor2-%{version}.tar.gz @@ -19,7 +19,9 @@ BuildRequires: curl-devel BuildRequires: gtk-doc BuildRequires: libicu-devel BuildRequires: pkgconfig(libxslt) +%if ! 0%{?rhel} BuildRequires: yajl-devel +%endif # when /usr/bin/rappor moved here -- rex Conflicts: raptor < 1.4.21-10 @@ -46,10 +48,18 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build + +%if 0%{?rhel} +%define distrooptions --with-yajl=no +%else +%define distrooptions --with-yajl=yes +%endif + %configure \ --disable-static \ --enable-release \ - --with-icu-config=/usr/bin/icu-config + --with-icu-config=/usr/bin/icu-config \ + %{distrooptions} %make_build @@ -88,6 +98,9 @@ make check %changelog +* Mon Aug 10 2020 Caolán McNamara - 2.0.15-26 +- Resolves: rhbz#1560206 drop requirement on yajl + * Sat Aug 01 2020 Fedora Release Engineering - 2.0.15-25 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild