[jgraphx] Provide maven pom.xml
Clément David
davidcl at fedoraproject.org
Wed Mar 11 08:08:18 UTC 2015
commit c3fc1312fe7bba5e5f2387977427cd636ef2d3c4
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Wed Mar 11 09:07:28 2015 +0100
Provide maven pom.xml
jgraphx.spec | 39 +++++++++++++--------------------------
sources | 2 +-
2 files changed, 14 insertions(+), 27 deletions(-)
---
diff --git a/jgraphx.spec b/jgraphx.spec
index ec70730..89ea131 100644
--- a/jgraphx.spec
+++ b/jgraphx.spec
@@ -1,6 +1,6 @@
Name: jgraphx
Version: 3.1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Graph Drawing Component
Group: Development/Libraries
@@ -9,9 +9,7 @@ URL: http://www.jgraph.com/jgraph.html
Source0: http://www.jgraph.com/downloads/jgraphx/archive/%{name}-%(echo %{version} |sed 's/\./_/g').zip
BuildRequires: ant
-BuildRequires: java-devel >= 1.6
-BuildRequires: jpackage-utils
-Requires: java >= 1.4
+Requires: java-headless
Requires: jpackage-utils
BuildArch: noarch
@@ -20,7 +18,6 @@ BuildArch: noarch
JGraphX is the a powerful, easy-to-use and feature-rich graph drawing
component for Java. It is a rewrite of JGraph, also known as JGraph 6.
-
%package javadoc
Summary: API Documentation for %{name}
Group: Documentation
@@ -30,39 +27,29 @@ Requires: %{name} = %{version}-%{release}
%description javadoc
JavaDoc documentation for %{name}
-
%prep
%setup -q -n %{name}
find -name '*.jar' -delete
rm -rf docs/api
-
%build
-ant
-
+ant build maven-jar
%install
+%mvn_artifact pom.xml lib/%{name}.jar
+%mvn_install -J docs/api/
-# Code
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -p -m644 lib/%{name}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# API documentation
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -a docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-%files
-%{_javadir}/*
-%doc license.txt
-
-
-%files javadoc
-%{_javadocdir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%license license.txt
+%files javadoc -f .mfiles-javadoc
+%license license.txt
%changelog
+* Wed Mar 11 2015 Clément David <c.david86 at gmail.com> - 3.1.2.0-2
+- Provide maven pom.xml
+
* Tue Dec 09 2014 Clément David <c.david86 at gmail.com> - 3.1.2.0-1
- Update version
diff --git a/sources b/sources
index b125368..29f850d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2eca095c396809e31518ad763b1960cf jgraphx-3_1_2_0.zip
+3b48a97492b568714f749e0e71039a37 jgraphx-3_1_2_0.zip
More information about the scm-commits
mailing list