update to 1.1.0 [release 1.1.0-1mamba;Sun Jan 18 2015]

jsoncpp.spec

@@ -1,14 +1,15 @@
 %define pkgver %(echo %version | tr _ -)
 Name:          jsoncpp
-Version:       0.6.0_rc2
-Release:       2mamba
+Version:       1.1.0
+Release:       1mamba
 Summary:       An implementation of a JSON reader and writer in C++
 Group:         System/Libraries
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://jsoncpp.sourceforge.net/
-Source:        http://downloads.sourceforge.net/project/jsoncpp/jsoncpp/%{pkgver}/jsoncpp-src-%{pkgver}.tar.gz
+Source:        https://github.com/open-source-parsers/jsoncpp.git/%{version}/jsoncpp-%{version}.tar.bz2
+#Source:        http://downloads.sourceforge.net/project/jsoncpp/jsoncpp/%{pkgver}/jsoncpp-src-%{pkgver}.tar.gz
 Patch0:        jsoncpp-0.5.0-soname.patch
 Patch1:        jsoncpp-0.6.0_rc2-buildfix-fPIC.patch
 License:       MIT
@@ -41,41 +42,17 @@ This package contains libraries and header files for developing applications tha
 %debug_package
 
 %prep
-%setup -q -n %{name}-src-%{pkgver}
-%patch0 -p1
-%patch1 -p1
+%setup -q
+#%patch0 -p1
+#%patch1 -p1
 
 %build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
-scons platform=linux-gcc
+%cmake -d build
+%make
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-
-install -d -m0755 %{buildroot}{%{_includedir}/jsoncpp,%{_libdir}}
-cp -a include/json %{buildroot}%{_includedir}/jsoncpp
-
-cp libs/linux-gcc-*/libjson_linux-gcc-*_libmt.so %{buildroot}%{_libdir}/libjsoncpp.so.0
-ln -s libjsoncpp.so.0 %{buildroot}%{_libdir}/libjsoncpp.so
-
-install -d -m0755 %{buildroot}%{_libdir}/pkgconfig
-cat > %{buildroot}%{_libdir}/pkgconfig/jsoncpp.pc << _EOF
-prefix=%{_prefix}
-libdir=%{_libdir}
-includedir=%{_includedir}/jsoncpp
-
-version = %{version}
-
-name = jsoncpp
-pkgname = libjsoncpp
-
-Name: \${name}
-Version: 0.6.0_rc2
-Description: Jsoncpp library version %{version}
-Cflags: -I\${includedir}
-Libs: -L\${libdir} -ljsoncpp
-_EOF
+%makeinstall -C build
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@@ -90,14 +67,15 @@ _EOF
 
 %files -n lib%{name}-devel
 %defattr(-,root,root)
-%dir %{_includedir}/jsoncpp
-%dir %{_includedir}/jsoncpp/json
-%{_includedir}/jsoncpp/json/*.h
+%dir %{_includedir}/json
+%{_includedir}/json/*.h
 %{_libdir}/libjsoncpp.so
 %{_libdir}/pkgconfig/jsoncpp.pc
-%doc README.txt
 
 %changelog
+* Sun Jan 18 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.0-1mamba
+- update to 1.1.0
+
 * Wed Sep 17 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.0_rc2-2mamba
 - provide pkg-config file
 - move headers to %{_includedir}/jsoncpp