- up to 1.6.0

- removed obsolete patches

diff --git a/jsoncpp-libdir.patch b/jsoncpp-libdir.patch
deleted file mode 100644 (file)
index d314c96..0000000
--- a/jsoncpp-libdir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- jsoncpp-1.0.0/pkg-config/jsoncpp.pc.in.orig        2014-11-20 15:45:58.000000000 +0100
-+++ jsoncpp-1.0.0/pkg-config/jsoncpp.pc.in     2014-12-25 22:42:34.036718112 +0100
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@
- includedir=${prefix}/@INCLUDE_INSTALL_DIR@
- 
- Name: jsoncpp

diff --git a/jsoncpp-test.patch b/jsoncpp-test.patch
deleted file mode 100644 (file)
index 193916d..0000000
--- a/jsoncpp-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- jsoncpp-1.0.0/src/test_lib_json/main.cpp.orig      2014-11-20 15:45:58.000000000 +0100
-+++ jsoncpp-1.0.0/src/test_lib_json/main.cpp   2014-12-25 22:06:20.003476014 +0100
-@@ -661,7 +661,7 @@
-   JSONTEST_ASSERT_EQUAL(kint32max, val.asUInt());
-   JSONTEST_ASSERT_EQUAL(kint32max, val.asLargestUInt());
-   JSONTEST_ASSERT_EQUAL(kint32max, val.asDouble());
--  JSONTEST_ASSERT_EQUAL(kfint32max, val.asFloat());
-+  JSONTEST_ASSERT_EQUAL(kint32max, (int)val.asFloat());
-   JSONTEST_ASSERT_EQUAL(true, val.asBool());
-   JSONTEST_ASSERT_STRING_EQUAL("2147483647", val.asString());
- 

diff --git a/jsoncpp.spec b/jsoncpp.spec
index 337e7f20e8283ffdc4171499851d7e61c2744735..90f633669b72e0f7c3123ab93d5954430b1989ae 100644 (file)
--- a/jsoncpp.spec
+++ b/jsoncpp.spec
@@ -6,14 +6,12 @@
 Summary:       API for manipulating JSON
 Summary(pl.UTF-8):     API do operacji na strukturach JSON
 Name:          jsoncpp
-Version:       1.0.0
-Release:       2
+Version:       1.6.0
+Release:       1
 License:       MIT or Public Domain
 Group:         Libraries
 Source0:       https://github.com/open-source-parsers/jsoncpp/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 4c886ac3bfccc867a79f3a5280ce1152
-Patch0:                %{name}-test.patch
-Patch1:                %{name}-libdir.patch
+# Source0-md5: 51b47ef5bfc95bf2388c1ace864b4453
 URL:           https://github.com/open-source-parsers/jsoncpp/
 BuildRequires: cmake >= 2.8.5
 BuildRequires: libstdc++-devel
@@ -57,8 +55,6 @@ Dokumentacja API biblioteki JSONCPP.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 install -d build