diff --git a/1.7.2.tar.gz b/1.7.2.tar.gz deleted file mode 100644 index 616c951..0000000 --- a/1.7.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2179a7df19c1c6dc87e02c65b847efc914625a9b87df3e443d9610fc70c0f557 -size 205391 diff --git a/jsoncpp-1.7.3.tar.gz b/jsoncpp-1.7.3.tar.gz new file mode 100644 index 0000000..c40a3a4 --- /dev/null +++ b/jsoncpp-1.7.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cfcad14054039ba97c22531888796cb9369e6353f257aacaad34fda956ada53 +size 205738 diff --git a/jsoncpp.changes b/jsoncpp.changes index e77397c..c0bf157 100644 --- a/jsoncpp.changes +++ b/jsoncpp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jun 30 08:46:23 UTC 2016 - mpluskal@suse.com + +- Update to version 1.7.3: + * Fix static initialization of null with Myers Singleton. + * Fix other minor compiler and installation problems and + warnings. + * Fix amalgamated header. +- Drop -doc subpackage + ------------------------------------------------------------------- Sat Apr 2 09:40:09 UTC 2016 - mpluskal@suse.com diff --git a/jsoncpp.spec b/jsoncpp.spec index 74c6c02..da3ec77 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -18,19 +18,16 @@ %define libname lib%{name}1 Name: jsoncpp -Version: 1.7.2 +Version: 1.7.3 Release: 0 Summary: C++ library that allows manipulating with JSON License: MIT Group: Development/Libraries/C and C++ Url: https://github.com/open-source-parsers/jsoncpp -Source0: https://github.com/open-source-parsers/%{name}/archive/%{version}.tar.gz +Source0: https://github.com/open-source-parsers/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: doxygen -BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: python -BuildRequires: pkgconfig(pkg-config) +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,7 +42,7 @@ format to store user input files. %package devel Summary: Development files for %{name} Group: Development/Languages/C and C++ -Requires: %{libname} = %{version}-%{release} +Requires: %{libname} = %{version} %description devel JSON is a lightweight data-interchange format. It can represent numbers, @@ -56,20 +53,6 @@ serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files. -%package doc -Summary: Documentation for %{name} -Group: Documentation/HTML -BuildArch: noarch - -%description doc -JSON is a lightweight data-interchange format. It can represent numbers, -strings, ordered sequences of values, and collections of name/value pairs. - -JsonCpp is a C++ library that allows manipulating JSON values, including -serialization and deserialization to and from strings. It can also preserve -existing comment in unserialization/serialization steps, making it a convenient -format to store user input files. - %package -n %{libname} Summary: Shared library for %{name} Group: System/Libraries @@ -87,16 +70,14 @@ format to store user input files. %setup -q %build -python doxybuild.py --doxygen=%{_bindir}/doxygen --open %cmake \ - -DJSONCPP_WITH_CMAKE_PACKAGE=ON + -DJSONCPP_WITH_CMAKE_PACKAGE=ON # path needs to be exported otherwise unit tests will fail export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/build/src/lib_json make %{?_smp_mflags} %install %cmake_install -%fdupes -s dist/doxygen rm -rf %{buildroot}%{_libdir}/lib%{name}.a %post -n %{libname} -p /sbin/ldconfig @@ -115,8 +96,4 @@ rm -rf %{buildroot}%{_libdir}/lib%{name}.a %{_libdir}/lib%{name}.so %{_includedir}/json/ -%files doc -%defattr(-,root,root) -%doc dist/doxygen/jsoncpp* - %changelog