diff --git a/SPECS/args4j.spec b/SPECS/args4j.spec
index 16fd3bf..eaf4eb9 100644
--- a/SPECS/args4j.spec
+++ b/SPECS/args4j.spec
@@ -1,13 +1,8 @@
-
-Name: args4j
-%global tools_name %{name}-tools
-%global site_name %{name}-site
-
+Name: args4j
Version: 2.0.16
-Release: 11%{?dist}
+Release: 13%{?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
# http://args4j.java.net/
URL: http://%{name}.java.net/
# Upload Your personal ssh key to java.net (otherwise the export fails)
@@ -23,13 +18,7 @@ Patch3: %{name}-srcencoding.patch
BuildArch: noarch
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-junit
-
-Requires: java
-Requires: jpackage-utils
%description
args4j is a small Java class library that makes it easy
@@ -45,8 +34,6 @@ args4j-tools are development-time tools for generating additional artifacits.
%package javadoc
Summary: API documentation for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -60,50 +47,40 @@ This package contains the API documentation for %{name}.
%patch3 -p1
# removing classpath addition
-sed -i 's/<addClasspath>true/<addClasspath>false/g' %{tools_name}/pom.xml
+sed -i 's/<addClasspath>true/<addClasspath>false/g' %{name}-tools/pom.xml
# removing bundled stuff
rm -rf repo
rm -rf www
rm -rf %{name}/lib
+# Remove system-scoped dependency on tools.jar
+%pom_remove_dep jdk:tools args4j-tools
+%pom_add_dep com.sun:tools args4j-tools
+
+%mvn_file ":{*}" @1
+
%build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
%install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -p -m 644 %{tools_name}/target/%{tools_name}-%{version}.jar %{buildroot}%{_javadir}/%{tools_name}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-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_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}
-
-%files
+%mvn_install
+
+%files -f .mfiles
%doc %{name}/LICENSE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{tools_name}.jar
-%{_mavenpomdir}/JPP-%{site_name}.pom
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{tools_name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
+
+%files javadoc -f .mfiles-javadoc
%doc %{name}/LICENSE.txt
-%doc %{_javadocdir}/%{name}
%changelog
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2.0.16-13
+- Mass rebuild 2013-12-27
+
+* Wed Nov 13 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.16-12
+- Build with XMvn
+- Remove system-scoped dependency on tools.jar
+- Update to current packaging guidelines
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.16-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild