[jdiff] try to fix java8 build
gil
gil at fedoraproject.org
Sun Jun 8 23:50:58 UTC 2014
commit 514daefbdf8d8b0bd20b9a0d1bbc3506e7fb3e37
Author: gil <puntogil at libero.it>
Date: Mon Jun 9 01:50:40 2014 +0200
try to fix java8 build
jdiff-java8.patch | 20 ++++++++++++++++++++
jdiff.spec | 6 +++++-
2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/jdiff-java8.patch b/jdiff-java8.patch
new file mode 100644
index 0000000..2dfa581
--- /dev/null
+++ b/jdiff-java8.patch
@@ -0,0 +1,20 @@
+--- src/jdiff/RootDocToXML.java 2008-10-06 20:03:18.000000000 +0200
++++ src/jdiff/RootDocToXML.java-gil 2014-06-09 01:47:57.440619802 +0200
+@@ -479,7 +479,7 @@
+ continue;
+ outputFile.print(" <constructor name=\"" + ctorName + "\"");
+
+- Parameter[] params = ct[i].parameters();
++ com.sun.javadoc.Parameter[] params = ct[i].parameters();
+ boolean first = true;
+ if (params.length != 0) {
+ outputFile.print(" type=\"");
+@@ -552,7 +552,7 @@
+ addCommonModifiers(md[i], 6);
+ outputFile.println(">");
+ // Generate the parameter elements, if any
+- Parameter[] params = md[i].parameters();
++ com.sun.javadoc.Parameter[] params = md[i].parameters();
+ for (int j = 0; j < params.length; j++) {
+ outputFile.print(" <param name=\"" + params[j].name() + "\"");
+ outputFile.print(" type=\"");
diff --git a/jdiff.spec b/jdiff.spec
index 71f5516..42f49fe 100644
--- a/jdiff.spec
+++ b/jdiff.spec
@@ -16,6 +16,8 @@ Source0: jdiff-1.1.1-clean-src-cvs.tar.gz
Source1: jdiff-pom-template.xml
Source2: jdiff-script
+Patch0: jdiff-java8.patch
+
BuildRequires: java-devel
BuildRequires: jpackage-utils
@@ -50,6 +52,9 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n jdiff
+
+%patch0 -p0
+
perl -pi -e 's/\r$//g' doc/CHANGES.txt doc/KNOWN_LIMITATIONS.txt doc/TODO doc/dev_notes.txt
perl -pi -e 's/\r$//g' LICENSE.txt README.txt
@@ -60,7 +65,6 @@ ln -sf $(build-classpath xerces-j2) lib/xerces.jar
native2ascii -encoding UTF8 test/old/ChangedPackageDoc2/ChangedMethod.java test/old/ChangedPackageDoc2/ChangedMethod.java
native2ascii -encoding UTF8 test/new/ChangedPackageDoc2/ChangedMethod.java test/new/ChangedPackageDoc2/ChangedMethod.java
-sed -i.java8 "s|Parameter[] params = md[i].parameters();|com.sun.javadoc.Parameter[] params = md[i].parameters();|" src/jdiff/RootDocToXML.java
%build
export CLASSPATH=$(build-classpath junit):`pwd`/build/lib/jdiff.jar:`pwd`/build/lib/antjdiff.jar
More information about the scm-commits
mailing list