diff --git a/dom4j-1.6.1-debian.tar.bz2 b/dom4j-1.6.1-debian.tar.bz2
new file mode 100644
index 0000000..935f0ae
--- /dev/null
+++ b/dom4j-1.6.1-debian.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d72427a11a23df97f8957331269df7fde4fcc982ac3b9d399a49e4df8598b94a
+size 1962425
diff --git a/dom4j-1.6.1.tar.bz2 b/dom4j-1.6.1.tar.bz2
deleted file mode 100644
index e19dc99..0000000
--- a/dom4j-1.6.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:68cf5b06dee7a617cd7078946d78ef0084f0c01306c5787819dc085299afe337
-size 8287503
diff --git a/include-glibj.jar.patch b/include-glibj.jar.patch
index 182bb23..435551c 100644
--- a/include-glibj.jar.patch
+++ b/include-glibj.jar.patch
@@ -1,8 +1,6 @@
-Index: jdom-1.0/XOM/build.xml
-===================================================================
---- jdom-1.0.orig/XOM/build.xml
-+++ jdom-1.0/XOM/build.xml
-@@ -72,6 +72,7 @@ subject line. The XOM home page is http:
+--- XOM/build.xml
++++ XOM/build.xml
+@@ -72,6 +72,7 @@
@@ -10,30 +8,3 @@ Index: jdom-1.0/XOM/build.xml
-@@ -95,6 +96,7 @@ subject line. The XOM home page is http:
-
-
-
-+
-
-
-
-Index: jdom-1.0/jdom-1.0/build.xml
-===================================================================
---- jdom-1.0.orig/jdom-1.0/build.xml
-+++ jdom-1.0/jdom-1.0/build.xml
-@@ -68,12 +68,14 @@ For instructions on how to build JDOM, p
-
-
-
-+
-
-
-
-
-
-
-+
-
-
-
diff --git a/java150_build.patch b/java150_build.patch
deleted file mode 100644
index 109fe76..0000000
--- a/java150_build.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-Index: jdom-1.0/XOM/build.xml
-===================================================================
---- jdom-1.0.orig/XOM/build.xml
-+++ jdom-1.0/XOM/build.xml
-@@ -381,6 +381,7 @@ XOM Build file
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
-+
-
-
-
-Index: jdom-1.0/jdom-1.0/build.xml
-===================================================================
---- jdom-1.0.orig/jdom-1.0/build.xml
-+++ jdom-1.0/jdom-1.0/build.xml
-@@ -164,6 +164,7 @@ For instructions on how to build JDOM, p
- classpathref="compile.class.path"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@@ -218,6 +221,7 @@
- author="true"
- version="true"
- use="true"
-+ source="1.4"
- splitindex="true"
- noindex="false"
- windowtitle="${Name} Full JavaDoc"
-@@ -232,6 +236,7 @@
-
-
-
-
-
-+
-
-
-
diff --git a/jdom-1.0.tar.bz2 b/jdom-1.0.tar.bz2
deleted file mode 100644
index 3735bcb..0000000
--- a/jdom-1.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:607b1d4b21e64ff7ae40776191d2f6b55ca999c6eecf18e27ccc19f882fae574
-size 3449689
diff --git a/jdom-1.1-build.xml.patch b/jdom-1.1-build.xml.patch
new file mode 100644
index 0000000..8230d15
--- /dev/null
+++ b/jdom-1.1-build.xml.patch
@@ -0,0 +1,21 @@
+--- jdom-1.1/build.xml
++++ jdom-1.1/build.xml
+@@ -39,8 +39,8 @@
+
+
+
+-
+-
++
++
+
+
+
+@@ -75,6 +75,7 @@
+
+
+
++
+
+
+
diff --git a/jdom-1.1-xom-get-jaxen.patch b/jdom-1.1-xom-get-jaxen.patch
new file mode 100644
index 0000000..65625ae
--- /dev/null
+++ b/jdom-1.1-xom-get-jaxen.patch
@@ -0,0 +1,13 @@
+--- XOM/build.xml
++++ XOM/build.xml
+@@ -729,7 +729,9 @@
+
+
+
+-
++
++
++
+
+
+
diff --git a/jdom-1.1.tar.bz2 b/jdom-1.1.tar.bz2
new file mode 100644
index 0000000..0af889a
--- /dev/null
+++ b/jdom-1.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e63a7ef30c644bea97fa255e64773b6e6ee4eb1d5799a9a34f3220533944ee98
+size 3336664
diff --git a/jdom.changes b/jdom.changes
index 26a2068..438e682 100644
--- a/jdom.changes
+++ b/jdom.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed May 20 11:44:18 CEST 2009 - mvyskocil@suse.cz
+
+- 'fixed bnc#501764: removed clover.license from source tarball'
+
+-------------------------------------------------------------------
+Mon May 18 15:36:12 CEST 2009 - mvyskocil@suse.cz
+
+- Removed documentation of ConcurrentReaderHashMap (bnc#504663)
+ * dom4j-1.6.1/docs/clover/org/dom4j/tree/ConcurrentReaderHashMap.html
+ * dom4j-1.6.1/docs/xref/org/dom4j/tree/ConcurrentReaderHashMap.html
+
+-------------------------------------------------------------------
+Thu May 14 15:09:13 CEST 2009 - mvyskocil@suse.cz
+
+- fixed version tag for jaxen and xom
+
+-------------------------------------------------------------------
+Tue Jan 20 14:52:53 CET 2009 - mvyskocil@suse.cz
+
+- update jdom to 1.1 fixed bnc#467366
+- updated jaxen to 1.1.1 (do not use an included jaxen)
+- cleaned build requires
+- Obsoleted java150 patch
+
-------------------------------------------------------------------
Fri Nov 21 16:38:31 CET 2008 - ro@suse.de
diff --git a/jdom.spec b/jdom.spec
index 758360d..4844ed0 100644
--- a/jdom.spec
+++ b/jdom.spec
@@ -1,7 +1,7 @@
#
-# spec file for package jdom (Version 1.0)
+# spec file for package jdom (Version 1.1)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,40 +22,46 @@ Name: jdom
%define xom_version 1.2b1
%define xom_suffix ""
%define xom_dir %{_builddir}/%{name}-%{jdom_version}/XOM
-%define xom_included_jaxen_archive jaxen-%{jaxen_version}-src.zip
-%define jdom_version 1.0
+%define xom_included_jaxen_archive jaxen-1.1-src.zip
+%define jdom_version 1.1
%define jdom_suffix ""
%define dom4j_version 1.6.1
%define dom4j_suffix ""
-%define dom4j_dir %{_builddir}/%{name}-%{jdom_version}/dom4j-%{dom4j_version}
+%define dom4j_dir %{_builddir}/%{name}-%{jdom_version}/dom4j
%define saxpath_version 1.0
%define saxpath_suffix -FCS
%define saxpath_dir %{_builddir}/%{name}-%{jdom_version}/saxpath-%{saxpath_version}%{saxpath_suffix}
-%define jaxen_version 1.1
+%define jaxen_version 1.1.1
%define jaxen_suffix ""
-%define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen
+%define jaxen_dir %{_builddir}/%{name}-%{jdom_version}/jaxen-%{jaxen_version}
%define jdom_dir %{_builddir}/%{name}-%{jdom_version}/%{name}-%{jdom_version}
%define stage1_build_dir %{_builddir}/build
#<<< defines
#>>> package info
#>>> jdom
-BuildRequires: ant ant-junit gcc-java junit servletapi5 xalan-j2 xerces-j2
-BuildRequires: classpath fastjar gcc-gij gjdoc java-1_4_2-gcj-compat java-1_4_2-gcj-compat-devel unzip
-#BuildRequires: java2-devel-packages
+BuildRequires: ant ant-junit junit servletapi5 xalan-j2 xerces-j2
+BuildRequires: fastjar java-1_5_0-gcj-compat-devel unzip
License: The Apache Software License
Group: Development/Libraries/Java
AutoReqProv: on
-Version: 1.0
-Release: 271
+Version: 1.1
+Release: 3
Summary: JDOM is a Java Representation of an XML Document
Url: http://www.jdom.org
Source0: %{name}-%{version}.tar.bz2
Source1: saxpath-%{saxpath_version}.tar.bz2
Source2: xom-%{xom_version}-src.tar.bz2
-Source3: dom4j-1.6.1.tar.bz2
-Patch0: jdom-1.0-build.xml.patch
+# svn co svn://svn.debian.org/svn/pkg-java/trunk/dom4j
+# rm dom4j/docs/xref/org/dom4j/tree/ConcurrentReaderHashMap.html
+# rm dom4j/docs/clover/org/dom4j/tree/ConcurrentReaderHashMap.html
+# #bnc501764
+# rm dom4j/lib/tools/clover.license
+# tar --exclude-vcs -cjf dom4j-1.6.1-debian.tar.bz2 dom4j/
+Source3: dom4j-%{dom4j_version}-debian.tar.bz2
+Source4: jaxen-%{jaxen_version}-src.tar.bz2
+Patch0: jdom-1.1-build.xml.patch
Patch1: include-glibj.jar.patch
-Patch150: java150_build.patch
+Patch2: jdom-1.1-xom-get-jaxen.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
#ExclusiveArch: %ix86
@@ -78,7 +84,7 @@ Authors:
%package -n saxpath
License: The Apache Software License
Version: 1.0_FCS
-Release: 271
+Release: 274
Summary: SAXPath is an event-based API for XPath parsers
Group: Development/Libraries/Java
@@ -123,8 +129,8 @@ Authors:
%package -n xom
License: LGPL v2.1 or later
-Version: 1.0_FCS
-Release: 271
+Version: 1.2b1
+Release: 2
Summary: XOM™ is a new XML object model
Group: Development/Languages/Java
@@ -171,8 +177,8 @@ Authors:
%package -n jaxen
License: The Apache Software License
-Version: 1.0_FCS
-Release: 271
+Version: 1.1.1
+Release: 2
Summary: The jaxen project is a Java XPath Engine
Group: Development/Libraries/Java
@@ -214,30 +220,35 @@ Authors:
Steen Lehmann
%prep
-%setup -c foo -a 1 -a 2 -a 3
-unzip %{xom_dir}/%{xom_included_jaxen_archive}
+%setup -q -c foo -a 1 -a 2 -a 3 -a 4
+rm %{xom_dir}/%{xom_included_jaxen_archive}
mkdir %{stage1_build_dir}
# delete all inlcuded jar files:
find . -name "*.jar" -delete -name "*.class" -delete
-%patch0 -p1
-%patch1 -p1
-%patch150 -p1
+%patch0
+%patch1
+%patch2
+#%patch150 -p1
#<<< prep
#>>> build
%build
LIBGCJ=$(ls /usr/share/java/libgcj* | tail -n1 )
LIBGCJ=$(basename $LIBGCJ)
-export JAVACMD_OPTS="-Xss8M -C -ftarget=1.4"
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
-export JAVACMD="javac -C ${JAVACMD_OPTS} "
+export JAVACMD_OPTS="-C -ftarget=1.5"
+export JAVACMD="javac ${JAVACMD_OPTS} "
i=0
-for file in $(find %{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java -name "*.java")
+export CLASSPATH="%{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit servletapi5):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java"
+SOURCE_DIRS="%{jaxen_dir}/src/java/main/ %{jdom_dir}/src/java/ %{saxpath_dir}/src/java/main/ %{xom_dir}/src/ %{dom4j_dir}/src/java"
+MAX=$(find ${SOURCE_DIRS} -iname "*.java" | wc -l)
+for file in $(find ${SOURCE_DIRS} -name "*.java")
do
i=$((i+1))
- echo compiling class \# $i
- ${JAVACMD} -classpath %{stage1_build_dir}:$(build-classpath $LIBGCJ xerces-j2 xalan-j2 xalan-j2-serializer junit servletapi5):%{jaxen_dir}/src/java/main/:%{jdom_dir}/src/java/:%{saxpath_dir}/src/java/main/:%{xom_dir}/src/:%{dom4j_dir}/src/java -target 1.4 -source 1.4 -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file"
+ echo compiling class \# $i of ${MAX}
+ ${JAVACMD} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file"
done
+unset CLASSPATH SOURCE_DIRS MAX
## some files faile with the ibm compiler ... lets try them wiht the gcj:
#for file in $FAILED_FILES
#do
@@ -249,7 +260,9 @@ pushd %{jdom_dir}
ant -Dparser.jar=$(build-classpath xerces-j2) \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Dglibj.jar=$(build-classpath glibj) \
- -Djaxen.lib.dir=%{stage1_build_dir} package
+ -Djaxen.lib.dir=%{stage1_build_dir} \
+ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+ package
mv build/jdom.jar %{_builddir}/jdom-%{jdom_version}.jar
popd
pushd %{jaxen_dir}/src/java/main
@@ -277,6 +290,7 @@ ant \
-Dresolver.jar=$(build-classpath xml-commons-resolver) \
-Ddom4j.jar=%{stage1_build_dir} \
-Dglibj.jar=$(build-classpath glibj) \
+ -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
compile compile15 jar
mv build/xom-%{xom_version}.jar %{_builddir}
popd
@@ -311,6 +325,19 @@ rm -rf $RPM_BUILD_ROOT
# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42:
%changelog
+* Wed May 20 2009 mvyskocil@suse.cz
+- 'fixed bnc#501764: removed clover.license from source tarball'
+* Mon May 18 2009 mvyskocil@suse.cz
+- Removed documentation of ConcurrentReaderHashMap (bnc#504663)
+ * dom4j-1.6.1/docs/clover/org/dom4j/tree/ConcurrentReaderHashMap.html
+ * dom4j-1.6.1/docs/xref/org/dom4j/tree/ConcurrentReaderHashMap.html
+* Thu May 14 2009 mvyskocil@suse.cz
+- fixed version tag for jaxen and xom
+* Tue Jan 20 2009 mvyskocil@suse.cz
+- update jdom to 1.1 fixed bnc#467366
+- updated jaxen to 1.1.1 (do not use an included jaxen)
+- cleaned build requires
+- Obsoleted java150 patch
* Fri Nov 21 2008 ro@suse.de
- update check-build.sh
* Wed Jan 23 2008 mvyskocil@suse.cz