[umlgraph] Do not call git during build.

Alexander Kurtakov akurtakov at fedoraproject.org
Mon Jul 23 13:38:18 UTC 2012


commit 476c72791abd0e55680bf69ffb288dba3524d1c7
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Jul 23 16:37:34 2012 +0300

    Do not call git during build.

 fix-build.patch |   25 +++++++++++++++++++++++++
 umlgraph.spec   |    8 ++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 0000000..a5d75fd
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,25 @@
+--- 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;
diff --git a/umlgraph.spec b/umlgraph.spec
index e799a69..5113782 100644
--- a/umlgraph.spec
+++ b/umlgraph.spec
@@ -1,6 +1,6 @@
 Name:           umlgraph
 Version:        5.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Automated Drawing of UML Diagrams
 
 Group:          Development/Libraries
@@ -8,11 +8,11 @@ License:        BSD
 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
 
 BuildRequires: ant
 BuildRequires: graphviz
 BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: git
 Requires: graphviz
 Requires: java
 
@@ -37,6 +37,7 @@ sed -i -e 's|<attribute name=\"Class-Path\" value=\"tools.jar\"/>||g' build.xml
 for f in $(find . -name "*.jar"); do
     mv $f $f.no
 done
+%patch0 -b .sav
 
 %build
 ant compile test javadocs
@@ -67,6 +68,9 @@ cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jul 23 2012 Alexander Kurtakov <akurtako at redhat.com> 5.6-3
+- Do not call git during build.
+
 * Mon Jul 23 2012 Alexander Kurtakov <akurtako at redhat.com> 5.6-2
 - BR git.
 


More information about the scm-commits mailing list