From 73e9fd47835f044d6a72a55129ca1223545c487f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Willmann?= Date: Mon, 20 Jun 2016 20:23:30 +0200 Subject: [PATCH] Revert #1336082 --- jsoncpp.spec | 8 ++++---- path.patch | 11 ----------- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 path.patch diff --git a/jsoncpp.spec b/jsoncpp.spec index 8c96d76..62d184f 100644 --- a/jsoncpp.spec +++ b/jsoncpp.spec @@ -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 - 1.7.2-3 +- Revert #1336082 + * Mon Jun 13 2016 Sébastien Willmann - 1.7.2-2 - Fix include dir path (#1336082) diff --git a/path.patch b/path.patch deleted file mode 100644 index cdbd7b7..0000000 --- a/path.patch +++ /dev/null @@ -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