[apiviz] Switch to xmvn + BR updates
Marek Goldmann
goldmann at fedoraproject.org
Tue Jun 17 11:49:29 UTC 2014
commit 17b7caa412232c142dd04dfc2f91b81a474d36e7
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Tue Jun 17 13:49:11 2014 +0200
Switch to xmvn + BR updates
apiviz-pom.patch => 0001-JDK7-compatibility.patch | 21 ++++++--
0002-JDK8-compatibility.patch | 30 +++++++++++
apiviz-1.3.1.GA-jdk7.patch | 24 ---------
apiviz.spec | 55 +++++++++------------
4 files changed, 70 insertions(+), 60 deletions(-)
---
diff --git a/apiviz-pom.patch b/0001-JDK7-compatibility.patch
similarity index 74%
rename from apiviz-pom.patch
rename to 0001-JDK7-compatibility.patch
index 7d3a570..42721d9 100644
--- a/apiviz-pom.patch
+++ b/0001-JDK7-compatibility.patch
@@ -1,7 +1,17 @@
-diff -Naur apiviz-1.3.1.GA/pom.xml apiviz-1.3.1.GA-work/pom.xml
---- apiviz-1.3.1.GA/pom.xml 2010-03-04 04:06:04.000000000 -0500
-+++ apiviz-1.3.1.GA-work/pom.xml 2011-06-03 12:42:16.693372903 -0400
-@@ -192,9 +192,9 @@
+From fa5958d0acc8fc0988c1f2897382ae9c121d6619 Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Tue, 17 Jun 2014 12:03:41 +0200
+Subject: [PATCH] JDK7 compatibility
+
+---
+ pom.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index ef9edf5..dc06021 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -172,9 +172,9 @@
<include name="NOTICE.*" />
<include name="COPYRIGHT.*" />
</zipfileset>
@@ -13,3 +23,6 @@ diff -Naur apiviz-1.3.1.GA/pom.xml apiviz-1.3.1.GA-work/pom.xml
<zipfileset src="${project.build.directory}/${project.build.finalName}.orig.jar" filemode="644" dirmode="755">
<exclude name="*/*/*/example/**" />
<exclude name="jdepend/**" />
+--
+1.9.3
+
diff --git a/0002-JDK8-compatibility.patch b/0002-JDK8-compatibility.patch
new file mode 100644
index 0000000..af826c4
--- /dev/null
+++ b/0002-JDK8-compatibility.patch
@@ -0,0 +1,30 @@
+From 34fb236060b558d8cee2c0865e9b655838bd379c Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Tue, 17 Jun 2014 12:03:54 +0200
+Subject: [PATCH] JDK8 compatibility
+
+---
+ src/main/java/org/jboss/apiviz/Edge.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/main/java/org/jboss/apiviz/Edge.java b/src/main/java/org/jboss/apiviz/Edge.java
+index 07fa1b0..1f72b55 100644
+--- a/src/main/java/org/jboss/apiviz/Edge.java
++++ b/src/main/java/org/jboss/apiviz/Edge.java
+@@ -580,5 +580,13 @@ public class Edge implements Comparable<Edge> {
+ public AnnotationTypeDoc asAnnotationTypeDoc() {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
++
++ public Type getElementType() {
++ return null;
++ }
++
++ public AnnotatedType asAnnotatedType() {
++ throw new UnsupportedOperationException("Not supported yet.");
++ }
+ }
+ }
+--
+1.9.3
+
diff --git a/apiviz.spec b/apiviz.spec
index 9a0293d..2e07acc 100644
--- a/apiviz.spec
+++ b/apiviz.spec
@@ -3,20 +3,19 @@
Name: apiviz
Version: 1.3.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: APIviz is a JavaDoc doclet to generate class and package diagrams
Group: Development/Libraries
License: LGPLv2+
URL: http://code.google.com/p/apiviz/
Source0: http://apiviz.googlecode.com/files/apiviz-%{namedversion}-dist.tar.gz
-Patch0: apiviz-pom.patch
+Patch0: 0001-JDK7-compatibility.patch
+Patch1: 0002-JDK8-compatibility.patch
BuildArch: noarch
BuildRequires: jpackage-utils
-BuildRequires: java-1.7.0-devel
BuildRequires: maven-local
-
BuildRequires: maven-antrun-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -26,17 +25,11 @@ BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-jxr
BuildRequires: jdepend
BuildRequires: ant-contrib
-BuildRequires: junit4
-BuildRequires: ant
-
-Requires: jdepend
-Requires: jpackage-utils
-Requires: java-headless
-Requires: graphviz
+BuildRequires: junit
%description
APIviz is a JavaDoc doclet which extends the Java standard doclet.
@@ -46,7 +39,6 @@ quick understanding of the overall API structure.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -55,38 +47,37 @@ This package contains the API documentation for %{name}.
%setup -q -n apiviz-%{namedversion}
%patch0 -p1
+%if 0%{?fedora} >= 21
+%patch1 -p1
+%endif
+
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
-%build
-mvn-rpmbuild install javadoc:aggregate
+#%pom_xpath_remove "pom:dependencies/pom:dependency[pom:artifactId = 'tools']/pom:scope"
+#%pom_xpath_remove "pom:dependencies/pom:dependency[pom:artifactId = 'tools']/pom:systemPath"
-%install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%pom_remove_dep com.sun:tools
+%pom_add_dep com.sun:tools
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_alias "org.jboss.apiviz:apiviz" "net.gleamynode.apiviz:apiviz"
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%build
+%mvn_build
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "net.gleamynode.apiviz:apiviz"
+%install
+%mvn_install
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
%doc COPYRIGHT.txt LICENSE.jdepend.txt LICENSE.txt NOTICE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
+* Tue Jun 17 2014 Marek Goldmann <mgoldman at redhat.com> - 1.3.2-8
+- Switch to xmvn + BR updates
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list