From 4f00f78f016742c219502a0de3c9855a3caaf328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 10 Dec 2017 16:02:52 +0100 Subject: [PATCH] New upstream release (rhbz#1524155) --- .gitignore | 1 + json-c-0.12.1-lt_init.patch | 22 ---------------------- json-c.spec | 15 +++++++-------- sources | 2 +- 4 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 json-c-0.12.1-lt_init.patch diff --git a/.gitignore b/.gitignore index 5445e7a..0d58425 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /json-c-0.11-20130402.tar.gz /json-c-0.12-20140410.tar.gz /json-c-0.12.1-20160607.tar.gz +/json-c-0.13-20171207.tar.gz diff --git a/json-c-0.12.1-lt_init.patch b/json-c-0.12.1-lt_init.patch deleted file mode 100644 index 99537c4..0000000 --- a/json-c-0.12.1-lt_init.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4354964f137a66aab2dc3f397a4dee7ae7b57725 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 3 Jul 2017 12:17:36 +0200 -Subject: [PATCH] Replace obsolete AC_PROG_LIBTOOL - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 364d27d..bca7593 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -87,7 +87,7 @@ int main(int c,char* v) {return 0;} - - AC_LANG_POP([C]) - --AM_PROG_LIBTOOL -+LT_INIT - - # Check for the -Bsymbolic-functions linker flag - AC_ARG_ENABLE([Bsymbolic], diff --git a/json-c.spec b/json-c.spec index 42df3eb..f8e3a0a 100644 --- a/json-c.spec +++ b/json-c.spec @@ -1,19 +1,16 @@ -%global reldate 20160607 +%global reldate 20171207 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: json-c -Version: 0.12.1 -Release: 4%{?dist} +Version: 0.13 +Release: 1%{?dist} Summary: JSON implementation in C License: MIT URL: https://github.com/%{name}/%{name} Source0: %{url}/archive/json-c-%{version}-%{reldate}.tar.gz -# Upstreamed patch for obsolete autotools macro. -Patch0: https://github.com/json-c/json-c/pull/333.patch#/%{name}-0.12.1-lt_init.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -56,13 +53,12 @@ for doc in ChangeLog; do %{__mv} -f ${doc}.new ${doc} done -%{__sed} -i 's|-Werror ||g' Makefile.am.inc +%{_bindir}/echo -e '\nACLOCAL_AMFLAGS = -I autoconf-archive/m4' >> Makefile.am %{_bindir}/autoreconf -fiv %build %configure \ - --disable-rpath \ --disable-silent-rules \ --disable-static \ --enable-shared \ @@ -123,6 +119,9 @@ end %changelog +* Sun Dec 10 2017 Björn Esser - 0.13-1 +- New upstream release (rhbz#1524155) + * Thu Aug 03 2017 Fedora Release Engineering - 0.12.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index e23f9ae..73168d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (json-c-0.12.1-20160607.tar.gz) = 1e4e63b3a9dbd959049955a2fa548067edd394d7d7fa7a8ae86dbad3a7ed02058bc6353aefacd0cb56f3ec4bc01858c80d74a5264eb381eb4c7c15dee5fb81a6 +SHA512 (json-c-0.13-20171207.tar.gz) = bac85d9107694b479549a28ce79ae6a2eb937694a7848f7f69fb8a280b20ef39249d9d31aa3f82fd5d66a887dd96b2d17717e6e37b97156a3cc44fdfaa0138e0