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

diff --git a/jsoncpp.spec b/jsoncpp.spec
index 7cba6f82e1751df2ec5a4849b4519b27b8fc294d..c9c72fd7b532a1fb066d9e354b67955db215295c 100644 (file)
--- 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