[apache-commons-ognl] Update for newer guidelines

[mbooth]

commit 819716a958e64b83cf09459068142678a3c9584a
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Sun Aug 11 10:45:43 2013 +0100

    Update for newer guidelines

 apache-commons-ognl.spec |   45 +++++++++++++++------------------------------
 1 files changed, 15 insertions(+), 30 deletions(-)
---
diff --git a/apache-commons-ognl.spec b/apache-commons-ognl.spec
index 1c8754d..4e74e03 100644
--- a/apache-commons-ognl.spec
+++ b/apache-commons-ognl.spec
@@ -1,8 +1,8 @@
-%global oversion 4.0-incubating-SNAPSHOT
+%global short_name commons-ognl
 
-Name:           apache-commons-ognl
+Name:           apache-%{short_name}
 Version:        3.0.2
-Release:        5.20120313svn1102435%{?dist}
+Release:        6.20120313svn1102435%{?dist}
 Summary:        Object Graph Navigation Library
 
 Group:          Development/Libraries  
@@ -16,14 +16,8 @@ BuildArch:      noarch
 BuildRequires: java-devel
 BuildRequires: jpackage-utils    
 BuildRequires: maven-local
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-compiler-plugin
 BuildRequires: javassist
-BuildRequires: junit
 BuildRequires: jna
-Requires:      java
-Requires:      javassist
-Requires:      jpackage-utils
 
 %description
 OGNL is an expression language for getting and setting properties of
@@ -33,40 +27,31 @@ and lambda expressions.
 %package javadoc
 Summary:      API documentation for %{name}
 Group:        Documentation
-Requires:     jpackage-utils
 
 %description javadoc
-API documentation for %{name}.
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q 
+%setup -q
+
+%mvn_file :%{short_name} %{short_name} %{name}
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 target/commons-ognl-%{oversion}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-cp pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-install -d -m 755 %{buildroot}%{_javadocdir}
-cp -rp target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
 
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Sun Aug 11 2013 Mat Booth <fedora at matbooth.co.uk> - 3.0.2-6.20120313svn1102435
+- Update for newer guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-5.20120313svn1102435
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild