From 67e905e0ddf1b1697200b85a7726ed564be0a5d7 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Jul 29 2014 11:44:26 +0000 Subject: json-c renamed json.pc to json-c.pc --- diff --git a/mypaint.spec b/mypaint.spec index e345542..350e14f 100644 --- a/mypaint.spec +++ b/mypaint.spec @@ -2,7 +2,7 @@ Name: mypaint Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A fast and easy graphics application for digital painters Group: Applications/Multimedia @@ -62,6 +62,12 @@ developing applications that use %{name}. %patch0 -p1 -b .usrmove %patch1 -p1 -b .scons +%if 0%{fedora} >= 21 +# json.pc is now named json-c.pc beginning with json-c-devel-0.12 +sed -i "s/pkg_deps = \['json'\]/pkg_deps = \['json-c'\]/g" \ + brushlib/SConscript +%endif + # Ramon2 brushes unzip %{SOURCE1} -x order.conf -d brushes unzip -p %{SOURCE1} order.conf >> brushes/order.conf @@ -161,6 +167,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/pkgconfig/libmypaint.pc %changelog +* Tue Jul 29 2014 Thomas Spura - 1.1.0-3 +- json-c renamed json.pc to json-c.pc + * Sat Jun 07 2014 Fedora Release Engineering - 1.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild