diff --git a/json-c-0.11-cflags.patch b/json-c-0.11-cflags.patch deleted file mode 100644 index f632c2c..0000000 --- a/json-c-0.11-cflags.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff -up json-c-json-c-0.11-20130402/Makefile.am.inc.orig json-c-json-c-0.11-20130402/Makefile.am.inc ---- json-c-json-c-0.11-20130402/Makefile.am.inc.orig 2013-04-03 05:04:18.000000000 +0300 -+++ json-c-json-c-0.11-20130402/Makefile.am.inc 2013-09-10 23:16:02.537432646 +0300 -@@ -1,2 +1,2 @@ --AM_CFLAGS = -Wall -Werror -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -+AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -D_REENTRANT - diff --git a/json-c.spec b/json-c.spec index 6194355..dfea7a5 100644 --- a/json-c.spec +++ b/json-c.spec @@ -1,12 +1,12 @@ %global reldate 20140410 -Name: json-c -Version: 0.12 -Release: 1%{?dist} -Summary: A JSON implementation in C -License: MIT -URL: https://github.com/json-c/json-c/wiki -Source0: https://github.com/json-c/json-c/archive/json-c-%{version}-%{reldate}.tar.gz +Name: json-c +Version: 0.12 +Release: 1%{?dist} +Summary: A JSON implementation in C +License: MIT +URL: https://github.com/json-c/json-c/wiki +Source0: https://github.com/json-c/json-c/archive/json-c-%{version}-%{reldate}.tar.gz BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -25,9 +25,9 @@ This package contains libraries and header files for developing applications that use %{name}. %package doc -Summary: Reference manual for json-c +Summary: Reference manual for json-c %if 0%{?fedora} > 10 || 0%{?rhel} > 5 -BuildArch: noarch +BuildArch: noarch %endif %description doc @@ -45,9 +45,9 @@ for doc in ChangeLog; do done %build +# Get rid of rpath. autoreconf -fiv %configure --enable-shared --disable-static --disable-rpath --enable-rdrand -# parallel build is broken for now, make %{?_smp_mflags} make %{?_smp_mflags} %install @@ -59,6 +59,13 @@ find %{buildroot} -name '*.la' -delete -print %check make check +%pretrans devel -p +path = "%{_includedir}/json-c" +st = posix.stat(path) +if st and st.type == "link" then + os.remove(path) +end + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig