From a9058f2621fa2146e116fa3e76dbb11e39e66744 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Apr 14 2015 03:40:01 +0000
Subject: Cleanup spec file


---

diff --git a/apache-commons-jxpath.spec b/apache-commons-jxpath.spec
index 79ca830..8530343 100644
--- a/apache-commons-jxpath.spec
+++ b/apache-commons-jxpath.spec
@@ -1,33 +1,25 @@
-%global base_name       jxpath
-%global short_name      commons-%{base_name}
-
-Name:             apache-%{short_name}
-Version:          1.3
-Release:          21%{?dist}
-Summary:          Simple XPath interpreter
-
-Group:            Development/Libraries
-License:          ASL 2.0
-URL:              http://commons.apache.org/%{base_name}/
-Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Patch0:           %{short_name}-mockrunner.patch
-BuildArch:        noarch
-
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
-BuildRequires:    maven-local
-BuildRequires:    maven-antrun-plugin
-BuildRequires:    maven-assembly-plugin
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-plugin-bundle
-BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-plugin
-BuildRequires:    servlet
-BuildRequires:    mvn(javax.servlet:jsp-api)
-BuildRequires:    el_api
+Name:           apache-commons-jxpath
+Version:        1.3
+Release:        22%{?dist}
+Summary:        Simple XPath interpreter
+License:        ASL 2.0
+URL:            http://commons.apache.org/jxpath/
+BuildArch:      noarch
+
+Source0:        http://www.apache.org/dist/commons/jxpath/source/commons-jxpath-%{version}-src.tar.gz
+
+Patch0:         commons-jxpath-mockrunner.patch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(commons-beanutils:commons-beanutils)
+BuildRequires:  mvn(javax.servlet:jsp-api)
+BuildRequires:  mvn(javax.servlet:servlet-api)
+BuildRequires:  mvn(jdom:jdom)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
+BuildRequires:  mvn(xerces:xercesImpl)
+BuildRequires:  mvn(xml-apis:xml-apis)
 
 %description
 Defines a simple interpreter of an expression language called XPath.
@@ -35,33 +27,35 @@ JXPath applies XPath expressions to graphs of objects of all kinds:
 JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof.
 
 %package javadoc
-Summary:          API documentation for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%setup -q -n commons-jxpath-%{version}-src
 %patch0 -p1
 
+%mvn_file ":{*}" %{name} @1
+%mvn_alias : org.apache.commons:
+
 %build
 # we are skipping tests because we don't have com.mockrunner in repos yet
-%mvn_file  : %{short_name} %{name}
-%mvn_alias : org.apache.commons:%{short_name}
 %mvn_build -f
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Apr 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-22
+- Cleanup spec file
+
 * Wed Feb 25 2015 Alexander Kurtakov <akurtako@redhat.com> 1.3-21
 - Rebuild for jsp api.
 - Drop old javadoc pre section.