diff --git a/json-simple-hash-java-1.8.patch b/json-simple-hash-java-1.8.patch new file mode 100644 index 0000000..b580a6d --- /dev/null +++ b/json-simple-hash-java-1.8.patch @@ -0,0 +1,18 @@ +diff -uNr json-simple-1.1.1.ORIG/src/test/java/org/json/simple/Test.java json-simple-1.1.1/src/test/java/org/json/simple/Test.java +--- json-simple-1.1.1.ORIG/src/test/java/org/json/simple/Test.java 2014-07-22 09:55:47.058000000 +0000 ++++ json-simple-1.1.1/src/test/java/org/json/simple/Test.java 2014-07-22 14:17:16.942000000 +0000 +@@ -294,7 +294,7 @@ + pe.printStackTrace(); + } + } +- ++ /* + public void testEncode() throws Exception{ + System.out.println("=======encode======="); + +@@ -388,4 +388,5 @@ + System.out.println(jsonString); + assertEquals("[{\"k11\":\"v11\",\"k12\":\"v12\",\"k13\":\"v13\",\"k14\":{\"k31\":\"v3\",\"k32\":123.45,\"k33\":false,\"k34\":null,\"k35\":[\"vvv\",\"1.23456789123456789\",true,null]}},{\"k22\":\"v22\",\"k21\":\"v21\",\"k23\":\"v23\"}]",jsonString); + } ++ */ + } diff --git a/json_simple.spec b/json_simple.spec index 23e517c..e68b1b7 100644 --- a/json_simple.spec +++ b/json_simple.spec @@ -1,7 +1,7 @@ Name: json_simple Version: 1.1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Simple Java toolkit for JSON Group: Development/Libraries @@ -10,6 +10,8 @@ URL: http://code.google.com/p/json-simple/ # svn export http://json-simple.googlecode.com/svn/tags/tag_release_1_1_1/ json-simple-1.1.1 # tar czf json-simple-1.1.1-src-svn.tar.gz json-simple-1.1.1 Source0: json-simple-1.1.1-src-svn.tar.gz +#https://code.google.com/p/json-simple/issues/detail?id=97 +Patch0: json-simple-hash-java-1.8.patch BuildArch: noarch @@ -60,6 +62,8 @@ find . -name '*.jar' -exec rm -f '{}' \; # All the files have dos line endings, remove them. find . -type f -exec %{__sed} -i 's/\r//' {} \; +%patch0 -p1 + %build %{mvn_build} @@ -76,10 +80,12 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} +rm %{buildroot}%{_usr}/share/maven-metadata/json_simple.xml + %files %{_javadir}/%{name}.jar %{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +#%%{_mavendepmapfragdir}/%{name} %doc AUTHORS.txt ChangeLog.txt LICENSE.txt README.txt %files javadoc @@ -87,6 +93,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %doc LICENSE.txt %changelog +* Tue Jul 22 2014 Steve Traylen - 1.1.1-9 +- Skip hash tests for now bug #97 + * Mon Jul 21 2014 Steve Traylen - 1.1.1-8 - BR junit4 -> junit.