Attachment 907928 Details for Bug 1107031 – Patch for rawhide

[patch] Patch for rawhide

umlgraph-1107031.patch (text/plain), 2.44 KB, created by Yaakov Selkowitz on 2014-06-12 03:48:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-12 03:48:09 UTC

Size: 2.44 KB

patch

obsolete

>diff --git a/fix-jdk8.patch b/fix-jdk8.patch
>new file mode 100644
>index 0000000..9dbc1be
>--- /dev/null
>+++ b/fix-jdk8.patch
>@@ -0,0 +1,22 @@
>+--- a/src/org/umlgraph/doclet/WrappedClassDoc.java.sav	2012-04-25 03:57:52.000000000 -0500
>++++ b/src/org/umlgraph/doclet/WrappedClassDoc.java	2014-06-11 22:35:02.031646520 -0500
>+@@ -20,6 +20,7 @@
>+ 
>+ package org.umlgraph.doclet;
>+ 
>++import com.sun.javadoc.AnnotatedType;
>+ import com.sun.javadoc.AnnotationDesc;
>+ import com.sun.javadoc.AnnotationTypeDoc;
>+ import com.sun.javadoc.ClassDoc;
>+@@ -359,4 +360,11 @@ public class WrappedClassDoc implements
>+ 	return wrapped.typeParamTags();
>+     }
>+ 
>++    public AnnotatedType asAnnotatedType() {
>++	return wrapped.asAnnotatedType();
>++    }
>++
>++    public Type getElementType() {
>++	return wrapped.getElementType();
>++    }
>+ }
>diff --git a/umlgraph.spec b/umlgraph.spec
>index 01d3c7d..384127f 100644
>--- a/umlgraph.spec
>+++ b/umlgraph.spec
>@@ -1,6 +1,6 @@
> Name:           umlgraph
> Version:        5.6
>-Release:        7%{?dist}
>+Release:        8%{?dist}
> Summary:        Automated Drawing of UML Diagrams
> 
> Group:          Development/Libraries
>@@ -9,10 +9,11 @@ URL:            http://umlgraph.org/
> Source0:        http://umlgraph.org/UMLGraph-%{version}.tar.gz
> Source1:        http://repo2.maven.org/maven2/org/umlgraph/umlgraph/%{version}/%{name}-%{version}.pom
> Patch0:         fix-build.patch
>+Patch1:         fix-jdk8.patch
> 
> BuildRequires: ant
> BuildRequires: graphviz
>-BuildRequires: java-devel >= 1:1.6.0
>+BuildRequires: java-devel >= 1:1.8.0
> Requires: graphviz
> Requires: java-headless
> 
>@@ -32,7 +33,9 @@ Requires:       javapackages-tools
> API documentation for %{name}.
> 
> %prep
>-%autosetup -n UMLGraph-%{version}
>+%setup -q -n UMLGraph-%{version}
>+%patch0 -p0
>+%patch1 -p1
> 
> sed -i -e 's|<attribute name=\"Class-Path\" value=\"tools.jar\"/>||g' build.xml
> for f in $(find . -name "*.jar"); do
>@@ -58,16 +61,16 @@ rm -fr javadoc/gr/spinellis/umlgraph/doclet/*.dot
> rm -fr javadoc/org/umlgraph/doclet/*.dot
> cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
>-%files
>+%files -f .mfiles
> %doc README.txt
>-%{_javadir}/*
>-%{_mavenpomdir}/*
>-%{_mavendepmapfragdir}/*
> 
> %files javadoc
> %doc %{_javadocdir}/%{name}
> 
> %changelog
>+* Wed Jun 11 2014 Yaakov Selkowitz <yselkowi@redhat.com> - 5.6-8
>+- Fix FTBFS (#1107031)
>+
> * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 1107031: 905888 | 905889 | 905890 | 907928 | 914534