diff --git a/0001-Port-to-current-qdox.patch b/0001-Port-to-current-qdox.patch new file mode 100644 index 0000000..cce1931 --- /dev/null +++ b/0001-Port-to-current-qdox.patch @@ -0,0 +1,34 @@ +From 82c59ffdd9d0636236d9974dfbeb0d620364f640 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 10 Feb 2017 12:45:06 +0100 +Subject: [PATCH] Port to current qdox + +--- + .../com/thoughtworks/paranamer/generator/QdoxParanamerGenerator.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/paranamer-generator/src/java/com/thoughtworks/paranamer/generator/QdoxParanamerGenerator.java b/paranamer-generator/src/java/com/thoughtworks/paranamer/generator/QdoxParanamerGenerator.java +index 62266fe..644aa9c 100644 +--- a/paranamer-generator/src/java/com/thoughtworks/paranamer/generator/QdoxParanamerGenerator.java ++++ b/paranamer-generator/src/java/com/thoughtworks/paranamer/generator/QdoxParanamerGenerator.java +@@ -85,7 +85,7 @@ public class QdoxParanamerGenerator implements ParanamerGenerator { + content.append(addConstructors(javaClass.getConstructors())); + content.append(addMethods(javaClass.getMethods())); + // TODO problem with inner classes +- makeEnhancer().enhance(new File(outputPath, javaClass.getFullyQualifiedName().replace('.', File.separatorChar) + ".class"), content); ++ makeEnhancer().enhance(new File(outputPath, javaClass.getBinaryName().replace('.', File.separatorChar) + ".class"), content); + + } + } +@@ -171,7 +171,7 @@ public class QdoxParanamerGenerator implements ParanamerGenerator { + Iterator paramIter = parameters.iterator(); + while(paramIter.hasNext()) { + JavaParameter param = paramIter.next(); +- sb.append(param.getType().getCanonicalName()); ++ sb.append(param.getType().getCanonicalName().replaceAll("\\[\\]", "")); + if(paramIter.hasNext()) + { + sb.append(COMMA); +-- +2.9.3 + diff --git a/paranamer.spec b/paranamer.spec index 46326ab..eff35a6 100644 --- a/paranamer.spec +++ b/paranamer.spec @@ -1,12 +1,14 @@ %global githash cb6709646eed97c271d73f50ad750cc43c8e052a Name: paranamer Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for accessing non-private method parameter names at run-time License: BSD URL: https://github.com/paul-hammant/paranamer Source0: https://github.com/paul-hammant/paranamer/archive/%{githash}/%{name}-%{githash}.tar.gz +Patch0: 0001-Port-to-current-qdox.patch + BuildRequires: maven-local BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(javax.inject:javax.inject) @@ -67,6 +69,9 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{name}-%{githash} + +%patch0 -p1 + # Cleanup find -name "*.class" -print -delete # Do not erase test resources @@ -124,6 +129,9 @@ rm -r %{name}/src/test/com/thoughtworks/paranamer/BytecodeReadingParanamerTestCa %license LICENSE.txt %changelog +* Fri Feb 10 2017 Michael Simacek - 2.8-4 +- Port to current qdox + * Tue Jun 21 2016 gil cattaneo 2.8-3 - add missing build requires