Compare commits

...
Sign in to create a new pull request.

1 commit

8 changed files with 2 additions and 294 deletions

5
.gitignore vendored
View file

@ -1,5 +0,0 @@
UMLGraph-5.2.tar.gz
UMLGraph-5.4.tar.gz
UMLGraph-5.6.tar.gz
/umlgraph-5.7.2.tar.gz
/umlgraph-nogit.patch

2
dead.package Normal file
View file

@ -0,0 +1,2 @@
2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks.

View file

@ -1,25 +0,0 @@
--- build.xml.sav 2012-07-23 16:12:36.605075712 +0300
+++ build.xml 2012-07-23 16:14:05.525998247 +0300
@@ -47,7 +47,7 @@
<property name="groupId" value="org.umlgraph" />
<property name="artifactId" value="UmlGraph" />
<!-- <property name="version" value="1.0-SNAPSHOT" /> -->
-<gitversion outputproperty="version"/>
+<property name="version" value="1.6"/>
<!-- define artifacts' name, which follows the convention of Maven -->
<property name="maven-jar" value="${dist}/lib/${artifactId}-${version}.jar" />
@@ -76,12 +76,7 @@
</target>
<target name="version">
- <exec executable="git"
- outputproperty="VERSION">
- <arg value="describe"/>
- <arg value="--abbrev=6"/>
- <arg value="HEAD"/>
- </exec>
+ <property name="VERSION" value="1.6"/>
<echo>Version is ${VERSION}</echo>
<echo file="src/org/umlgraph/doclet/Version.java">/* Automatically generated file */
package org.umlgraph.doclet;

View file

@ -1,22 +0,0 @@
--- 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();
+ }
}

View file

@ -1,2 +0,0 @@
256fee4f74c52112f96969a5482b0b57 umlgraph-5.7.2.tar.gz
b5fe72440d7c0a83fa096d0b9c829820 umlgraph-nogit.patch

View file

@ -1,38 +0,0 @@
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.umlgraph</groupId>
<artifactId>umlgraph</artifactId>
<packaging>jar</packaging>
<name>UMLGraph</name>
<version>5.6</version>
<description>Declarative Drawing of UML Diagrams</description>
<url>http://www.umlgraph.org</url>
<licenses>
<license>
<name>BSD License (original)</name>
<url>http://www.opensource.org/licenses/bsd-license.php</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>https://github.com/dspinellis/UMLGraph</url>
<connection>git://github.com/dspinellis/UMLGraph.git</connection>
</scm>
<developers>
<developer>
<id>dspinellis</id>
<name>Diomidis Spinellis</name>
<email>dds@aueb.gr</email>
</developer>
</developers>
<dependencies/>
</project>

View file

@ -1,56 +0,0 @@
diff --git a/build.xml.sav b/build.xml
index ebf912c..e2f8e30 100644
--- a/build.xml.sav
+++ b/build.xml
@@ -17,37 +17,10 @@
<property name="dist" location="dist" />
-<!-- obtain version from git; see http://techblog.41concepts.com/2009/05/08/generating-ant-build-numbers-using-subversion/ -->
-<macrodef name="gitversion" description="Get git version.">
- <attribute name="outputproperty"/>
- <sequential>
- <echo message="git describe --abbrev=6 => '@{outputproperty}'"/>
- <exec executable="git"
- failonerror="true"
- outputproperty="@{outputproperty}">
- <arg value="describe"/>
- <arg value="--abbrev=6"/>
- <arg value="HEAD"/>
- <redirector>
- <outputfilterchain>
- <tokenfilter>
- <replaceregex pattern="R" replace=""/>
- <replaceregex pattern="_" replace="."/>
- <replaceregex pattern="-" replace="."/>
- <replaceregex pattern="(-.*)$" replace="-SNAPSHOT"/>
- </tokenfilter>
- </outputfilterchain>
- </redirector>
- </exec>
- <echo message="gitversion returned '${@{outputproperty}}'"/>
- </sequential>
-</macrodef>
-
<!-- define Maven coordinates; see https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-7c.DeploySnapshotsandStageReleaseswithAnt -->
<property name="groupId" value="org.umlgraph" />
<property name="artifactId" value="UmlGraph" />
-<!-- <property name="version" value="1.0-SNAPSHOT" /> -->
-<gitversion outputproperty="version"/>
+<property name="version" value="${VERSION}" />
<!-- define artifacts' name, which follows the convention of Maven -->
<property name="maven-jar" value="${dist}/lib/${artifactId}-${version}.jar" />
@@ -76,12 +49,6 @@
</target>
<target name="version">
- <exec executable="git"
- outputproperty="VERSION">
- <arg value="describe"/>
- <arg value="--abbrev=6"/>
- <arg value="HEAD"/>
- </exec>
<echo>Version is ${VERSION}</echo>
<echo file="src/main/java/org/umlgraph/doclet/Version.java">/* Automatically generated file */
package org.umlgraph.doclet;

View file

@ -1,146 +0,0 @@
%global version_url %(echo %{version}|tr . _)
%global jar %{name}.jar
%global java_home /usr/lib/jvm/java
Name: umlgraph
Version: 5.7.2
Release: 9%{?dist}
Summary: Automated Drawing of UML Diagrams
License: BSD
URL: http://%{name}.org/
Source0: https://github.com/dspinellis/%{name}/archive/R%{version_url}.tar.gz#/%{name}-%{version}.tar.gz
#Source1: http://repo2.maven.org/maven2/org/%{name}/%{name}/5.6.6/%{name}-5.6.6.pom
Patch0: umlgraph-nogit.patch
BuildRequires: ant
BuildRequires: graphviz
# javadoc API must be for jdk8
BuildRequires: java-devel >= 1.8
Requires: graphviz
Requires: java-headless
BuildArch: noarch
%description
%{name} allows the declarative specification and drawing of UML class
and sequence diagrams. The specification is done in text diagrams,
that are then transformed into the appropriate graphical representations.
%package javadoc
Summary: Javadoc for %{name}
Requires: javapackages-tools
%description javadoc
API documentation for %{name}.
%prep
%setup -q -nUMLGraph-R%{version_url}
%patch0 -p1
# clean make environment
sed -i 's|\${VERSION}|%{version}|g' build.xml
sed -i 's|UmlGraph.jar|%{jar}|g' build.xml
sed -i 's|javase/7|javase/8|g' build.xml
sed -i 's|\(VERSION:=\).*|\1%{version}|' Makefile
sed -i 's|UmlGraph.jar|%{jar}|g' Makefile
sed -i 's|.*dds.*||g' Makefile
sed -i 's|UmlGraph.jar|%{jar}|g' doc/Makefile
sed -i 's|.gif|.svg|g' doc/Makefile
sed -i 's|.*NOTETOOLS.*||g' doc/Makefile
find . -name "*.jar" -delete
%build
export JAVA_HOME=%{java_home}
make all
make docs
ant pom
%check
export JAVA_HOME=%{java_home}
make test
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 lib/%{jar} $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
#install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
install -m 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
rm -fr javadoc/gr/spinellis/%{name}/doclet/*.dot
rm -fr javadoc/org/%{name}/doclet/*.dot
cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files -f .mfiles
%doc README.txt TODO LICENSE
%{_javadir}/*.jar
%files javadoc
%doc LICENSE
%doc %{_javadocdir}/%{name}/
%changelog
* Sat Nov 22 2014 Raphael Groner <projects.rg [AT] smart.ms> - 5.7.2-9
- R5_7_2 (rhbz#1159808)
- release from github
- remove upstreamed jdk8 patch
- remove deprecated Group tags
- license file for subpackage
* 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
* Fri Feb 21 2014 Alexander Kurtakov <akurtako@redhat.com> 5.6-6
- Require java-headless.
- Use autosetup.
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Mon Jul 23 2012 Alexander Kurtakov <akurtako@redhat.com> 5.6-3
- Do not call git during build.
* Mon Jul 23 2012 Alexander Kurtakov <akurtako@redhat.com> 5.6-2
- BR git.
* Mon Jul 23 2012 Alexander Kurtakov <akurtako@redhat.com> 5.6-1
- New upstream release.
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue Jan 11 2011 Alexander Kurtakov <akurtako@redhat.com> 5.4-1
- Update to upstream 5.4.
* Thu Oct 8 2009 Alexander Kurtakov <akurtako@redhat.com> 5.2-3
- BR openjdk.
* Wed Oct 7 2009 Alexander Kurtakov <akurtako@redhat.com> 5.2-2
- Add missing BR/R on graphviz.
* Thu Oct 1 2009 Alexander Kurtakov <akurtako@redhat.com> 5.2-1
- Initial package.