Update to version 1.8.4 (rhbz#1529017)

This commit is contained in:
Björn Esser 2017-12-26 08:47:41 +01:00
parent ac5bf5da56
commit 2959921586
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
3 changed files with 33 additions and 30 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ jsoncpp-src-0.6.0-rc2.tar.gz
/jsoncpp-1.8.0.tar.gz /jsoncpp-1.8.0.tar.gz
/jsoncpp-1.8.1.tar.gz /jsoncpp-1.8.1.tar.gz
/jsoncpp-1.8.3.tar.gz /jsoncpp-1.8.3.tar.gz
/jsoncpp-1.8.4.tar.gz

View File

@ -4,7 +4,7 @@
%global jsondir json %global jsondir json
Name: jsoncpp Name: jsoncpp
Version: 1.8.3 Version: 1.8.4
Release: 1%{?dist} Release: 1%{?dist}
Summary: JSON library implemented in C++ Summary: JSON library implemented in C++
@ -13,11 +13,6 @@ URL: https://github.com/open-source-parsers/%{name}
Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: cmake >= 3.1 BuildRequires: cmake >= 3.1
%if %{with jsoncpp_enables_doc}
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: hardlink
%endif
BuildRequires: python3-devel BuildRequires: python3-devel
%description %description
@ -38,6 +33,11 @@ This package contains the development headers and library for %{name}.
%if %{with jsoncpp_enables_doc} %if %{with jsoncpp_enables_doc}
%package doc %package doc
Summary: Documentation for %{name} Summary: Documentation for %{name}
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: hardlink
BuildArch: noarch BuildArch: noarch
%description doc %description doc
@ -64,7 +64,6 @@ pushd %{_target_platform}
-DPYTHON_EXECUTABLE="%{__python3}" \ -DPYTHON_EXECUTABLE="%{__python3}" \
.. ..
popd popd
%make_build -C %{_target_platform} %make_build -C %{_target_platform}
%if %{with jsoncpp_enables_doc} %if %{with jsoncpp_enables_doc}
@ -76,12 +75,12 @@ popd
%install %install
%make_install -C %{_target_platform} %make_install -C %{_target_platform}
mkdir -p %{buildroot}%{_docdir}/%{name}
install -pm 0644 README.md %{buildroot}%{_docdir}/%{name}
%if %{with jsoncpp_enables_doc} %if %{with jsoncpp_enables_doc}
mkdir -p %{buildroot}%{_docdir}/%{name}/html mkdir -p %{buildroot}%{_docdir}/%{name}/html
for f in README.md ; do install -pm 0644 dist/doxygen/*/*.{html,png} %{buildroot}%{_docdir}/%{name}/html
install -p -m 0644 $f %{buildroot}%{_docdir}/%{name}
done
install -p -m 0644 dist/doxygen/*/*.{html,png} %{buildroot}%{_docdir}/%{name}/html
hardlink -cfv %{buildroot}%{_docdir}/%{name} hardlink -cfv %{buildroot}%{_docdir}/%{name}
%endif %endif
@ -96,9 +95,9 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name}
%files %files
%license AUTHORS LICENSE %license AUTHORS LICENSE
%if %{with jsoncpp_enables_doc}
%doc %dir %{_docdir}/%{name} %doc %dir %{_docdir}/%{name}
%doc %{_docdir}/%{name}/README.md %doc %{_docdir}/%{name}/README.md
%if %{with jsoncpp_enables_doc}
%exclude %{_docdir}/%{name}/html %exclude %{_docdir}/%{name}/html
%endif %endif
%{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}.so.*
@ -108,17 +107,20 @@ hardlink -cfv %{buildroot}%{_docdir}/%{name}
%{_libdir}/lib%{name}.so %{_libdir}/lib%{name}.so
%{_includedir}/%{jsondir} %{_includedir}/%{jsondir}
%{_libdir}/cmake/* %{_libdir}/cmake/*
%{_libdir}/pkgconfig/jsoncpp.pc %{_libdir}/pkgconfig/%{name}.pc
%if %{with jsoncpp_enables_doc} %if %{with jsoncpp_enables_doc}
%files doc %files doc
%license %{_datadir}/licenses/%{name}* %license %{_datadir}/licenses/%{name}
%doc %{_docdir}/%{name}* %doc %{_docdir}/%{name}
%endif %endif
%changelog %changelog
* Tue Dec 26 2017 Björn Esser <besser82@fedoraproject.org> - 1.8.4-1
- Update to version 1.8.4 (rhbz#1529017)
* Tue Aug 29 2017 Björn Esser <besser82@fedoraproject.org> - 1.8.3-1 * Tue Aug 29 2017 Björn Esser <besser82@fedoraproject.org> - 1.8.3-1
- Update to version 1.8.3 (rhbz#1485908) - Update to version 1.8.3 (rhbz#1485908)

View File

@ -1 +1 @@
SHA512 (jsoncpp-1.8.3.tar.gz) = a5170ccbc440c1bd2b365e34f7367a55731d4fa86b2d323d11431cead771127364bad9d8e2e59dcbe41bc111d11a5da94988dec5e40b9119f793f43e487d7429 SHA512 (jsoncpp-1.8.4.tar.gz) = f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1