[jarbundler] adapt to current guideline, add maven pom

[gil]

commit c5904f3610742d70acb9a667e1b4485273e06169
Author: gil <puntogil at libero.it>
Date:   Thu Sep 5 14:00:31 2013 +0200

    adapt to current guideline, add maven pom

 jarbundler-template-pom.xml |   18 ++++++++++
 jarbundler.spec             |   74 ++++++++++++++++++++----------------------
 2 files changed, 53 insertions(+), 39 deletions(-)
---
diff --git a/jarbundler-template-pom.xml b/jarbundler-template-pom.xml
new file mode 100644
index 0000000..8958004
--- /dev/null
+++ b/jarbundler-template-pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>net.sourceforge.jarbundler</groupId>
+  <artifactId>jarbundler</artifactId>
+  <version>@VERSION@</version>
+
+  <description>
+    JarBundler is a feature-rich Ant task which will create a Mac OS X
+    application bundle from a list of Jar files and a main class name.
+    http://informagen.com/JarBundler/index.html
+  </description>
+
+  <dependencies>
+    <!-- none -->
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/jarbundler.spec b/jarbundler.spec
index d735750..c26c3af 100644
--- a/jarbundler.spec
+++ b/jarbundler.spec
@@ -1,23 +1,20 @@
-Name: jarbundler	
-Version: 2.2.0
-Release: 5%{?dist}
-Summary: A feature-rich Ant task which will create a Mac OS X application bundle
-
-Group:	Development/Libraries
-License: ASL 2.0
-URL:	http://informagen.com/JarBundler/
-Source0: http://informagen.com/JarBundler/dist/jarbundler.tar.gz
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-BuildRequires:	ant
+Name:          jarbundler	
+Version:       2.2.0
+Release:       6%{?dist}
+Summary:       A feature-rich Ant task which will create a Mac OS X application bundle
+License:       ASL 2.0
+URL:           http://informagen.com/JarBundler/
+Source0:       http://informagen.com/JarBundler/dist/%{name}.tar.gz
+Source1:       %{name}-template-pom.xml
+BuildRequires: ant
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 
-Requires: ant
-Requires: java
-Requires: jpackage-utils
+Requires:      ant
+Requires:      java
+Requires:      jpackage-utils
 
-BuildArch: noarch
+BuildArch:     noarch
 
 %description
 How many times has this happened to you? You've written a little 
@@ -37,10 +34,7 @@ cycle. It is free software licensed under the GNU General Public
 License.
 
 %package javadoc
-Summary: Javadocs for %{name}
-Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
+Summary:       Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -49,10 +43,11 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}-%{version}
 
 
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
-
+find -name '*.class' -delete
+find -name '*.jar' -delete
 
+cp -p %{SOURCE1} pom.xml
+sed -i "s|@VERSION@|%{version}|" pom.xml
 
 %build
 export CLASSPATH=
@@ -62,39 +57,40 @@ export OPT_JAR_LIST=:"ant/%{name}-%{version}"
 ant jar javadocs
 
 %install
-rm -rf %{buildroot}
 
 # jars
-install -Dpm 644 %{_builddir}/%{name}-%{version}/build/%{name}-%{version}.jar \
- %{buildroot}/%{_javadir}/ant/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar  %{buildroot}/%{_javadir}/ant/%{name}.jar
+mkdir -p %{buildroot}%{_javadir}/ant
+install -pm 644 build/%{name}.jar \
+ %{buildroot}/%{_javadir}/ant/%{name}.jar
+ln -s ../ant/%{name}.jar  %{buildroot}/%{_javadir}/%{name}.jar
 
-mkdir -p %{buildroot}%{_javadir}
-cp -a build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-mkdir -p  %{buildroot}/%{_javadocdir}/%{name}
-cp -rp %{_builddir}/%{name}-%{version}/javadoc \
- %{buildroot}/%{_javadocdir}/%{name}
+mkdir -p  %{buildroot}/%{_javadocdir}
+cp -rp javadoc %{buildroot}/%{_javadocdir}/%{name}
 
 mkdir -p  %{buildroot}/%{_sysconfdir}/ant.d
 echo "jarbundler" >  %{buildroot}/%{_sysconfdir}/ant.d/jarbundler
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_sysconfdir}/ant.d/jarbundler
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 %doc LICENSE.TXT
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
-
+%doc LICENSE.TXT
 
 %changelog
+* Sat Aug 24 2013 gil cattaneo <puntogil at libero.it> 2.2.0-6
+- adapt to current guideline
+- fix some rpmlint problems
+- add maven pom
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild