[packages/jsoncpp] - rel 2; make it compatible with how other distros package it

arekm arekm at pld-linux.org
Mon May 4 15:34:31 CEST 2015


commit f14332c8e70759749cbf0f263deebfedbdd25cbb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon May 4 15:34:25 2015 +0200

    - rel 2; make it compatible with how other distros package it

 jsoncpp.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/jsoncpp.spec b/jsoncpp.spec
index 7cba6f8..c9c72fd 100644
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -7,7 +7,7 @@ Summary:	API for manipulating JSON
 Summary(pl.UTF-8):	API do operacji na strukturach JSON
 Name:		jsoncpp
 Version:	1.6.2
-Release:	1
+Release:	2
 License:	MIT or Public Domain
 Group:		Libraries
 Source0:	https://github.com/open-source-parsers/jsoncpp/archive/%{version}/%{name}-%{version}.tar.gz
@@ -72,6 +72,7 @@ Dokumentacja API biblioteki JSONCPP.
 install -d build
 cd build
 %cmake .. \
+	-DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/%{name} \
 	-DARCHIVE_INSTALL_DIR:PATH=%{_lib} \
 	-DLIBRARY_INSTALL_DIR:PATH=%{_lib} \
 	-DPACKAGE_INSTALL_DIR:PATH=%{_lib}/cmake \
@@ -92,9 +93,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# <json/*> is too common, use <jsoncpp/*>
-%{__mv} $RPM_BUILD_ROOT%{_includedir}/{json,jsoncpp}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jsoncpp.git/commitdiff/f14332c8e70759749cbf0f263deebfedbdd25cbb



More information about the pld-cvs-commit mailing list