This commit is contained in:
Sébastien Willmann 2016-06-20 20:23:30 +02:00
parent d2152148a4
commit 73e9fd4783
2 changed files with 4 additions and 15 deletions

View File

@ -2,15 +2,13 @@
Name: jsoncpp
Version: 1.7.2
Release: 2%{?dist}
Release: 3%{?dist}
Summary: JSON library implemented in C++
License: Public Domain or MIT
URL: https://github.com/open-source-parsers/jsoncpp
Source0: https://github.com/open-source-parsers/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: path.patch
BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: graphviz
@ -41,7 +39,6 @@ This package contains the documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p0
%build
@ -97,6 +94,9 @@ install -p -m 0644 dist/doxygen/*/*.{html,png} $RPM_BUILD_ROOT%{_docdir}/%{name}
%changelog
* Mon Jun 20 2016 Sébastien Willmann <sebastien.willmann@gmail.com> - 1.7.2-3
- Revert #1336082
* Mon Jun 13 2016 Sébastien Willmann <sebastien.willmann@gmail.com> - 1.7.2-2
- Fix include dir path (#1336082)

View File

@ -1,11 +0,0 @@
--- pkg-config/jsoncpp.pc.in 2016-03-25 14:09:15.000000000 -0600
+++ pkg-config/jsoncpp.pc.in 2016-05-13 18:21:15.646173599 -0600
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=@LIBRARY_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@/json
Name: jsoncpp
Description: A C++ library for interacting with JSON