From 019e0c30317386fffcb85083aec29b91a40ee583 Mon Sep 17 00:00:00 2001
From: Jaromir Capik <jcapik@redhat.com>
Date: Dec 17 2012 13:38:54 +0000
Subject: Update to conform with latest Java packaging guidelines.


---

diff --git a/args4j.spec b/args4j.spec
index 0ca99d1..d031247 100644
--- a/args4j.spec
+++ b/args4j.spec
@@ -1,12 +1,10 @@
 
-%global group_id   args4j
-
 Name:              args4j
 %global tools_name %{name}-tools
 %global site_name  %{name}-site
 
 Version:          2.0.16
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          Small Java lib that makes it easy to parse command line options/args in CUI apps
 License:          MIT and BSD
 Group:            Development/Libraries
@@ -28,12 +26,10 @@ BuildArch:        noarch
 BuildRequires:    java-devel
 BuildRequires:    jpackage-utils
 BuildRequires:    maven
-BuildRequires:    maven-surefire-plugin
+BuildRequires:    maven-surefire-provider-junit
 
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 args4j is a small Java class library that makes it easy
@@ -86,20 +82,14 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{site_name}.pom
 install -pm 644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 install -pm 644 %{tools_name}/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{tools_name}.pom
 
-%add_to_maven_depmap %{group_id} %{site_name} %{version} JPP %{site_name}
-%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name}
-%add_to_maven_depmap %{group_id} %{tools_name} %{version} JPP %{tools_name}
+%add_maven_depmap JPP-%{site_name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap JPP-%{tools_name}.pom %{tools_name}.jar
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %doc %{name}/LICENSE.txt
 %{_javadir}/%{name}.jar
@@ -114,6 +104,9 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Dec 13 2012 Roland Grunberg <rgrunber@redhat.com> - 2.0.16-9
+- Update to conform with latest Java packaging guidelines.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.16-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild