[umlgraph] Update to upstream 5.4.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Jan 11 07:47:57 UTC 2011


commit e20783d9089fc779499b8631d653b1611300ecd8
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jan 11 09:47:00 2011 +0200

    Update to upstream 5.4.

 .gitignore    |    1 +
 sources       |    2 +-
 umlgraph.spec |   32 +++++++++++++++-----------------
 3 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 333a211..a85e3bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 UMLGraph-5.2.tar.gz
+UMLGraph-5.4.tar.gz
diff --git a/sources b/sources
index 2b0ee8e..19155ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afdfe57b1c5dc57b698eceae63527358  UMLGraph-5.2.tar.gz
+abd3891462e994d91d94af5ceac23391  UMLGraph-5.4.tar.gz
diff --git a/umlgraph.spec b/umlgraph.spec
index c5e97f3..e745d4d 100644
--- a/umlgraph.spec
+++ b/umlgraph.spec
@@ -1,22 +1,22 @@
 Name:           umlgraph
-Version:        5.2
-Release:        3%{?dist}
+Version:        5.4
+Release:        1%{?dist}
 Summary:        Automated Drawing of UML Diagrams
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://umlgraph.org/
-Source0:        http://umlgraph.org/UMLGraph-5.2.tar.gz
+Source0:        http://umlgraph.org/UMLGraph-%{version}.tar.gz
 Source1:        http://repo2.maven.org/maven2/org/umlgraph/doclet/5.1/doclet-5.1.pom
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   jpackage-utils >= 0:1.7.4
 Requires(postun): jpackage-utils >= 0:1.7.4
 
 BuildRequires: ant
 BuildRequires: graphviz
-BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: java-devel >= 1:1.6.0
 Requires: graphviz
+Requires: java
 
 BuildArch: noarch
 
@@ -28,6 +28,7 @@ that are then transformed into the appropriate graphical representations.
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -40,29 +41,24 @@ for f in $(find . -name "*.jar"); do
 done
 
 %build
-%ant compile test javadocs
+ant compile test javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 lib/UmlGraph.jar \
-    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+    $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 %add_to_maven_depmap org.umlgraph doclet %{version} JPP %{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -fr javadoc/gr/spinellis/umlgraph/doclet/*.dot
 rm -fr javadoc/org/umlgraph/doclet/*.dot
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %post
 %update_maven_depmap
@@ -74,15 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc README.txt
 %{_javadir}/*
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(-,root,root)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 11 2011 Alexander Kurtakov <akurtako at redhat.com> 5.4-1
+- Update to upstream 5.4.
+
 * Thu Oct 8 2009 Alexander Kurtakov <akurtako at redhat.com> 5.2-3
 - BR openjdk.
 


More information about the scm-commits mailing list