Compare commits

..

1 commit

Author SHA1 Message Date
Benjamin Lefoul
c720190231 Applying Fedora patches to EPEL7. 2017-02-09 07:27:04 +01:00
7 changed files with 219 additions and 1 deletions

2
.gitignore vendored Normal file
View file

@ -0,0 +1,2 @@
/apiviz-1.3.1.GA-dist.tar.gz
/apiviz-1.3.2.GA-dist.tar.gz

View file

@ -0,0 +1,28 @@
From fa5958d0acc8fc0988c1f2897382ae9c121d6619 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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>
- <zipfileset src="${settings.localRepository}/jdepend/jdepend/${jdepend-version}/jdepend-${jdepend-version}.jar" filemode="644" dirmode="755">
+ <!--<zipfileset src="${settings.localRepository}/jdepend/jdepend/${jdepend-version}/jdepend-${jdepend-version}.jar" filemode="644" dirmode="755">
<exclude name="META-INF/**" />
- </zipfileset>
+ </zipfileset>-->
<zipfileset src="${project.build.directory}/${project.build.finalName}.orig.jar" filemode="644" dirmode="755">
<exclude name="*/*/*/example/**" />
<exclude name="jdepend/**" />
--
1.9.3

View file

@ -0,0 +1,30 @@
From 34fb236060b558d8cee2c0865e9b655838bd379c Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@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

View file

@ -0,0 +1,15 @@
--- pom.xml.ORIG 2017-01-04 11:03:27.339833354 -0600
+++ pom.xml 2017-01-04 11:54:22.244914798 -0600
@@ -213,10 +213,10 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <id>attach-distribution</id>
+ <id>make-assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>

143
apiviz.spec Normal file
View file

@ -0,0 +1,143 @@
%global namedreltag .GA
%global namedversion %{version}%{?namedreltag}
Name: apiviz
Version: 1.3.2
Release: 13%{?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: 0001-JDK7-compatibility.patch
Patch1: 0002-JDK8-compatibility.patch
Patch2: 0003-fix-deprecated-assembly-goal.patch
BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: maven-local
BuildRequires: maven-antrun-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-plugin-jxr
BuildRequires: jboss-parent
BuildRequires: jdepend
BuildRequires: ant-contrib
BuildRequires: junit
%description
APIviz is a JavaDoc doclet which extends the Java standard doclet.
It generates comprehensive UML-like class and package diagrams for
quick understanding of the overall API structure.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q -n apiviz-%{namedversion}
%patch0 -p1
%patch1 -p1
%patch2 -p0
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
#%pom_xpath_remove "pom:dependencies/pom:dependency[pom:artifactId = 'tools']/pom:scope"
#%pom_xpath_remove "pom:dependencies/pom:dependency[pom:artifactId = 'tools']/pom:systemPath"
%pom_remove_dep com.sun:tools
%pom_add_dep com.sun:tools
%mvn_alias "org.jboss.apiviz:apiviz" "net.gleamynode.apiviz:apiviz"
%build
%mvn_build
%install
%mvn_install
%files -f .mfiles
%doc COPYRIGHT.txt LICENSE.jdepend.txt LICENSE.txt NOTICE.txt
%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt
%changelog
* Thu Feb 09 2017 Benjamin Lefoul <lef@fedoraproject.org> - 1.3.2-13
- Applying the fedora patches to EPEL7.
* Wed Jan 04 2017 Merlin Mathesius <mmathesi@redhat.com> - 1.3.2-12
- Correct deprecated assembly goal that was eliminated from
maven-assembly-plugin 3.x to fix FTBFS (BZ#1402518).
* Wed Dec 14 2016 Merlin Mathesius <mmathesi@redhat.com> - 1.3.2-11
- Add missing BuildRequires for jboss-parent to fix FTBFS (BZ#1402518).
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue Jun 17 2014 Marek Goldmann <mgoldman@redhat.com> - 1.3.2-8
- Switch to xmvn + BR updates
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.3.2-6
- Use Requires: java-headless rebuild (#1067528)
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.3.2-3
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
- Replace maven BuildRequires with maven-local
* Wed Oct 17 2012 Marek Goldmann <mgoldman@redhat.com> - 1.3.2-2
- Added maven-enforcer-plugin BR
* Wed Oct 17 2012 Marek Goldmann <mgoldman@redhat.com> - 1.3.2-1
- Upstream release 1.3.2.GA
- Removed JDK7 patch
* Mon Sep 3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.1-8
- Add missing R: graphviz
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Mar 12 2012 Marek Goldmann <mgoldman@redhat.com> 1.3.1-6
- Added additional POM mapping
* Fri Mar 09 2012 Marek Goldmann <mgoldman@redhat.com> 1.3.1-5
- Relocated jars to _javadir
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Nov 18 2011 Marek Goldmann <mgoldman@redhat.com> 1.3.1-3
- Working on on jdk7
* Wed Jul 27 2011 Marek Goldmann <mgoldman@redhat.com> 1.3.1-2
- Using upstream tarball
* Wed Jul 20 2011 Marek Goldmann <mgoldman@redhat.com> 1.3.1-1
- Initial packaging

View file

@ -1 +0,0 @@
Orphaned for 6+ weeks

1
sources Normal file
View file

@ -0,0 +1 @@
676cf2d7915593eb429efc132a1626ff apiviz-1.3.2.GA-dist.tar.gz