diff --git a/.gitignore b/.gitignore index 992f087..de6fe9c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -jansson-1.2.tar.bz2 -jansson-1.3.tar.bz2 -sphinx-fix.diff -/jansson-2.1.tar.bz2 -/jansson-2.3.tar.bz2 -/jansson-2.4.tar.bz2 -/jansson-2.5.tar.bz2 +/jansson-2*.tar.bz2 +/jansson-2*.tar.gz diff --git a/jansson.spec b/jansson.spec index 97ae557..5cd7fb6 100644 --- a/jansson.spec +++ b/jansson.spec @@ -1,5 +1,5 @@ Name: jansson -Version: 2.5 +Version: 2.6 Release: 1%{?dist} Summary: C library for encoding, decoding and manipulating JSON data @@ -7,9 +7,8 @@ Group: System Environment/Libraries License: MIT URL: http://www.digip.org/jansson/ Source0: http://www.digip.org/jansson/releases/jansson-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: python-sphinx +BuildRequires: python-sphinx %description Small library for parsing and writing JSON documents. @@ -35,30 +34,27 @@ make html make check %install -rm -rf "$RPM_BUILD_ROOT" make install INSTALL="install -p" DESTDIR="$RPM_BUILD_ROOT" rm "$RPM_BUILD_ROOT%{_libdir}"/*.la -%clean -rm -rf "$RPM_BUILD_ROOT" - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc LICENSE CHANGES %{_libdir}/*.so.* %files devel -%defattr(-,root,root,-) %doc doc/_build/html/* %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/* %changelog +* Thu Feb 13 2014 Jared Smith - 2.6-1 +- Update to Jansson 2.6 for CVE-2013-6401 + * Sat Jan 25 2014 Jiri Pirko 2.5-1 - Update to Jansson 2.5. diff --git a/sources b/sources index 8cc119a..e271832 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ab239be8c08871c8463b27cf7610947c jansson-2.5.tar.bz2 +c70a52488db623a26f7213c7c6b7c878 jansson-2.6.tar.bz2