[jaxen] Update to upstream version 1.1.6

[Michal Srb]

commit 627818cb54fe9c4d21529716618c2bf9e6f74cba
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Sep 2 10:23:59 2013 +0200

    Update to upstream version 1.1.6
    
    - Build with Maven
    - Update description
    - Adapt to current guidelines

 .gitignore |    1 +
 build.xml  |  144 ------------------------------------------------------------
 jaxen.spec |   91 +++++++++++++++-----------------------
 sources    |    3 +-
 4 files changed, 37 insertions(+), 202 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 254c6be..89a3439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 jaxen-1.1.1-src.tar.gz
 jaxen-1.1.3-src.tar.gz
+/jaxen-1.1.6-src.tar.gz
diff --git a/jaxen.spec b/jaxen.spec
index b0a7f78..749c81b 100644
--- a/jaxen.spec
+++ b/jaxen.spec
@@ -29,38 +29,35 @@
 #
 
 Name:           jaxen
-Version:        1.1.3
-Release:        10%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Epoch:          0
 Summary:        An XPath engine written in Java
 License:        BSD
 URL:            http://jaxen.codehaus.org/
-Group:          Development/Libraries
-Source0:        http://dist.codehaus.org/jaxen/distributions/jaxen-%{version}-src.tar.gz
-Source1:        build.xml
-Source2:        http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
-Requires:       dom4j >= 0:1.6.1
-Requires:       jdom >= 0:1.0-0.rc1.1jpp
-Requires:       xalan-j2
-Requires:       xerces-j2
-BuildRequires:  ant >= 0:1.6, jpackage-utils >= 0:1.6, junit, ant-junit
-BuildRequires:  java-devel
-BuildRequires:  dom4j >= 0:1.6.1
-BuildRequires:  jdom >= 0:1.0-0.rc1.1jpp
-BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
+Source0:        http://dist.codehaus.org/jaxen/distributions/%{name}-%{version}-src.tar.gz
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(dom4j:dom4j)
+BuildRequires:  mvn(jdom:jdom)
+BuildRequires:  mvn(org.sonatype.oss:oss-parent)
+BuildRequires:  mvn(xerces:xercesImpl)
+BuildRequires:  mvn(xml-apis:xml-apis)
+
 Provides:       jaxen-bootstrap <= %{version}-%{release}
 Obsoletes:      jaxen-bootstrap <= %{version}-%{release}
+
 BuildArch:      noarch
 
 %description
-Jaxen is an XPath engine written in Java to work against a variety of XML
-based object models such as DOM, dom4j and JDOM together with Java
-Beans.
+Jaxen is an open source XPath library written in Java. It is adaptable
+to many different object models, including DOM, XOM, dom4j, and JDOM.
+Is it also possible to write adapters that treat non-XML trees such as compiled
+Java byte code or Java beans as XML, thus enabling you to query these trees
+with XPath too.
 
 %package demo
 Summary:        Samples for %{name}
-Group:          Development/Documentation
 Requires:       jaxen = 0:%{version}-%{release}
 
 %description demo
@@ -68,64 +65,46 @@ Requires:       jaxen = 0:%{version}-%{release}
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
 
 %description javadoc
 %{summary}.
 
 %prep
 %setup -q 
-find . -name "*.jar" -exec rm -f {} \;
-cp %{SOURCE1} .
-cp %{SOURCE2} pom.xml
-mkdir -p target/lib
-pushd target/lib
-build-jar-repository . dom4j-1.6.1.jar jdom-1.0.jar 
-ln -s %{_javadir}/xerces-j2.jar xercesImpl-2.6.2.jar
-popd
+
 rm -rf src/java/main/org/jaxen/xom
 rm src/java/test/org/jaxen/test/XOM*.java
 %pom_remove_dep xom:xom
-%pom_remove_dep :maven-cobertura-plugin
-%pom_remove_dep :maven-findbugs-plugin
+
+%mvn_file : %{name}
+%mvn_alias : "saxpath:saxpath"
 
 %build
-mkdir .maven
-export CLASSPATH=$(build-classpath xml-commons-apis)
-ant -Dant.build.sysclasspath=first jar javadoc
+%mvn_build -f
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 target/%{name}-%{version}.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%mvn_install
 
 # demo
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples
-cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples
-
-# POM and depmap
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap -a saxpath:saxpath
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/samples
+cp -pr src/java/samples/* %{buildroot}%{_datadir}/%{name}/samples
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
-%doc %{_javadocdir}/*
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
 
 %files demo
-%{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}
 
 %changelog
+* Mon Sep 02 2013 Michal Srb <msrb at redhat.com> - 0:1.1.6-1
+- Update to upstream version 1.1.6
+- Build with Maven
+- Update description
+- Adapt to current guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 0447cc0..8e91eab 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-c89a75cd42267c3016e1873f638cada0  jaxen-1.1.3-src.tar.gz
-0cf28af9179573c8680157d94ef43971  jaxen-1.1.3.pom
+097d0a699d1f9999f52110d9240b2c1d  jaxen-1.1.6-src.tar.gz