[jrosetta] Update to 1.0.4, upstream switch to maven

[Clément David]

commit 3724b3af6b38621c1a9334b2fa64f50ed856c271
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Wed Oct 12 18:06:08 2011 +0200

    Update to 1.0.4, upstream switch to maven

 .gitignore    |    1 +
 jrosetta.spec |   91 +++++++++++++++++++++++++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 65 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f838cf..75b4b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 jrosetta-1.0.2-gpl.zip
+/jrosetta-1.0.4-sources.jar
diff --git a/jrosetta.spec b/jrosetta.spec
index 52e97c3..b2b2130 100644
--- a/jrosetta.spec
+++ b/jrosetta.spec
@@ -1,23 +1,31 @@
 Name:           jrosetta
-Version:        1.0.2
-Release:        3%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 Summary:        A common base to build a graphical console
 
 Group:          Development/Libraries
 License:        GPLv2
-URL:            http://dev.artenum.com/projects/JRosetta/
-#http://dev.artenum.com/projects/JRosetta/download/JRosetta-1-0-2/data/src-gpl?action=download&nodecorator
-Source0:        %{name}-%{version}-gpl.zip
+URL:            http://dev.artenum.com/projects/JRosetta
+Source0:        http://maven.artenum.com/content/groups/public/com/artenum/%{name}/%{version}/%{name}-%{version}-sources.jar
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 
-BuildRequires:  java-devel >= 0:1.5
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  ant
-Requires:       java >= 0:1.5
-Requires:       jpackage-utils >= 0:1.5
+BuildRequires:  jpackage-utils
+BuildRequires:  java-devel
+BuildRequires:  maven
 
+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-surefire-plugin
+BuildRequires:    maven-surefire-provider-junit4
+
+Requires:       jpackage-utils
+Requires:       java
 
 %description
 JRosetta provides a common base for graphical component that could be used
@@ -25,42 +33,69 @@ to build a graphical console in Swing with the latest requirements, such as
 command history, completion and so on for instance for scripting language
 or command line.
 
+%package javadoc
+Summary:        Javadocs for %{name}
+Group:          Documentation
+Requires:       jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-gpl
+%setup -q
+# remove jar format related directory
+rm -fr ../META-INF
 #wrong-file-end-of-line-encoding
 cp -p CHANGE.txt CHANGE.txt.CRLF
 sed -i -e 's/\r//' CHANGE.txt
 touch -r CHANGE.txt.CRLF CHANGE.txt
 rm CHANGE.txt.CRLF
 
-
-
 %build
-%ant make
-
+mvn-rpmbuild install javadoc:aggregate
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 
-for j in jrosetta-API jrosetta-engine ; do
-  install -pm 0644 dist/${j}.jar $RPM_BUILD_ROOT%{_javadir}/${j}-%{version}.jar
-  ln -fs ${j}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/${j}.jar
-done
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+cp -p modules/%{name}-api/target/%{name}-api-%{version}.jar \
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-API-%{version}.jar
+ln -s %{name}-API-%{version}.jar \
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-API.jar
+cp -p modules/%{name}-engine/target/%{name}-engine-%{version}.jar \
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-engine-%{version}.jar
+ln -s %{name}-engine-%{version}.jar \
+        $RPM_BUILD_ROOT%{_javadir}/%{name}-engine.jar
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml  \
+        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 modules/%{name}-api/pom.xml  \
+        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-API.pom
+install -pm 644 modules/%{name}-engine/pom.xml  \
+        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-engine.pom
+
+%add_maven_depmap JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}-API.pom %{name}-API.jar
+%add_maven_depmap JPP-%{name}-engine.pom %{name}-engine.jar
 
 %files
-%defattr(-,root,root,-)
-%doc CHANGE.txt COPYRIGHT LICENSE.txt
-%{_javadir}/jrosetta*.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavenpomdir}/JPP-%{name}-*.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}-*.jar
+%doc LICENSE.txt COPYRIGHT.txt CHANGE.txt
 
+%files javadoc
+%{_javadocdir}/%{name}
 
 %changelog
+* Wed Oct 12 2011 davidcl <c.david86 at gmail.com> - 1.0.4-1
+- Update version
+- Use maven as upstream does
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 5c92973..598e883 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a618078c118216eb2351e5db6e14a7d  jrosetta-1.0.2-gpl.zip
+5c3589d4207f71bad6eeefd4857bce50  jrosetta-1.0.4-sources.jar