diff --git a/.gitignore b/.gitignore
index a04a5a7..254c6be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
jaxen-1.1.1-src.tar.gz
+jaxen-1.1.3-src.tar.gz
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..0b28444
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ================================= WARNING ================================
+ Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.
+ ==========================================================================
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jaxen.spec b/jaxen.spec
index 018fbb1..7be7eb1 100644
--- a/jaxen.spec
+++ b/jaxen.spec
@@ -28,39 +28,16 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# We don't want to build with maven
-%define _without_maven 1
-
-# If you don't want to build with maven, and use straight ant instead,
-# give rpmbuild option '--without maven'
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
-# If you don't want the manual to be built, give rpmbuild option
-# '--without manual'
-%define with_manual %{!?_without_manual:1}%{?_without_manual:0}
-%define without_manual %{?_without_manual:1}%{!?_without_manual:0}
-
Name: jaxen
-Version: 1.1.1
-Release: 4.1%{?dist}
+Version: 1.1.3
+Release: 1%{?dist}
Epoch: 0
Summary: An XPath engine written in Java
License: BSD
-Url: http://jaxen.codehaus.org/
+URL: http://jaxen.codehaus.org/
Group: Development/Libraries
Source0: http://dist.codehaus.org/jaxen/distributions/jaxen-%{version}-src.tar.gz
-
-%if %{with_maven}
-Source1: pom-maven2jpp-depcat.xsl
-Source2: pom-maven2jpp-newdepmap.xsl
-Source3: pom-maven2jpp-mapdeps.xsl
-Source4: jaxen-1.1-b7-jpp-depmap.xml
-
-Source5: jaxen-1.1-b7-build.xml
-%endif
-
+Source1: build.xml
Requires: dom4j >= 0:1.6.1
Requires: jdom >= 0:1.0-0.rc1.1jpp
Requires: xalan-j2
@@ -68,15 +45,6 @@ Requires: xerces-j2
Requires: xom
BuildRequires: ant >= 0:1.6, jpackage-utils >= 0:1.6, junit, ant-junit
BuildRequires: java-devel
-%if %{with_maven}
-BuildRequires: maven >= 0:1.1, saxon, saxon-scripts
-BuildRequires: maven-plugin-changes >= 0:1.1
-BuildRequires: maven-plugin-file-activity >= 0:1.1
-BuildRequires: maven-plugin-developer-activity >= 0:1.1
-BuildRequires: maven-plugin-license >= 0:1.1
-BuildRequires: maven-plugin-jdepend >= 0:1.1
-BuildRequires: maven-plugin-tasklist >= 0:1.1
-%endif
BuildRequires: dom4j >= 0:1.6.1
BuildRequires: jdom >= 0:1.0-0.rc1.1jpp
BuildRequires: xalan-j2
@@ -85,24 +53,12 @@ BuildRequires: xom
Provides: jaxen-bootstrap <= %{version}-%{release}
Obsoletes: jaxen-bootstrap <= %{version}-%{release}
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%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.
-%if %{with_maven}
-%if %{with_manual}
-%package manual
-Summary: Documents for %{name}
-Group: Development/Documentation
-
-%description manual
-%{summary}.
-%endif
-%endif
-
%package demo
Summary: Samples for %{name}
Group: Development/Documentation
@@ -119,118 +75,49 @@ Group: Development/Documentation
%{summary}.
%prep
-# If you dont want to build with maven, give rpmbuild option '--without
-# maven'
-# If you dont want the manual to be built, give rpmbuild option
-# '--without manual'
-
-%setup -q -n %{name}-%{version}
+%setup -q
find . -name "*.jar" -exec rm -f {} \;
-
-%if %{with_maven}
-export DEPCAT=$(pwd)/jaxen-1.1-b7-depcat.new.xml
-echo '' > $DEPCAT
-echo '' >> $DEPCAT
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
- popd
-done
-echo >> $DEPCAT
-echo '' >> $DEPCAT
-/usr/bin/saxon $DEPCAT %{SOURCE2} > jaxen-1.1-b7-depmap.new.xml
-%else
+cp %{SOURCE1} .
mkdir -p target/lib
pushd target/lib
build-jar-repository . dom4j-1.6.1.jar jdom-1.0.jar xom-1.0.jar
ln -s %{_javadir}/xerces-j2.jar xercesImpl-2.6.2.jar
popd
-%endif
%build
-%if %{with_maven}
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-
mkdir .maven
-
-%if %{with_manual}
-maven \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$(pwd)/.maven \
- jar javadoc xdoc
-%else
-maven \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$(pwd)/.maven \
- jar javadoc
-%endif
-%else
-ant -Dnoget=true jar javadoc
-%endif
+export CLASSPATH=$(build-classpath xml-commons-apis)
+ant -Dant.build.sysclasspath=first jar javadoc
%install
-rm -rf $RPM_BUILD_ROOT
-
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/%{name}-%{version}.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%if %{with_maven}
-cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf target/docs/apidocs
-%else
-cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-%endif
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# manual
-%if %{with_maven}
-%if %{with_manual}
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%endif
-%endif
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# demo
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples
cp -pr src/java/samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/samples
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
-%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_javadir}/*
-%if %{with_maven}
-%if %{with_manual}
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%endif
-%endif
-
%files javadoc
-%defattr(0644,root,root,0755)
%doc %{_javadocdir}/*
%files demo
-%defattr(0644,root,root,0755)
%{_datadir}/%{name}-%{version}
%changelog
+* Tue Nov 29 2011 Alexander Kurtakov 0:1.1.3-1
+- Update to latest upstream version.
+- Adapt to current guidelines.
+
* Wed Feb 09 2011 Fedora Release Engineering - 0:1.1.1-4.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 59b32cf..0661434 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b598ae6b7e765a92e13667b0a80392f4 jaxen-1.1.1-src.tar.gz
+c89a75cd42267c3016e1873f638cada0 jaxen-1.1.3-src.tar.gz