pool/jdom
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jdom?expand=0&rev=4

Browse Source
This commit is contained in:
OBS User unknown 2009-06-05 21:12:40 +00:00 committed by Git OBS Bridge
parent 393b8352c3
commit 724b1126d0
12 changed files with 129 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom4j-1.6.1-debian.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d72427a11a23df97f8957331269df7fde4fcc982ac3b9d399a49e4df8598b94a
size 1962425

3
dom4j-1.6.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68cf5b06dee7a617cd7078946d78ef0084f0c01306c5787819dc085299afe337
size 8287503

35
include-glibj.jar.patch
View File

@ -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 @@
<property name="gnujaxp.jar" value="${lib2.dir}/gnujaxp.jar"/>
<property name="resolver.jar" value="${lib2.dir}/resolver.jar"/>
<property name="dom4j.jar" value="${lib2.dir}/dom4j-1.5.1.jar"/>
@ -10,30 +8,3 @@ Index: jdom-1.0/XOM/build.xml
<property name="excludes" value=".clover, .DS_Store, **/.DS_Store, **/.thumbnails/**, clover_html/**, clover/**, xom.gif, data/XInclude-Test-Suite/**, data/xmlconf/**, data/canonical/xmlconf/**, data/oasis*/**, **/testresults/**, **/pantry/**, **/workspace/**, **/junit*properties, **/.nautilus-metafile.xml, website/**, **/.project, **/.classpath, build/**, dist/**, .settings/**, lib2/**, xom.fb, jester*, trademark*"/>
@@ -95,6 +96,7 @@ subject line. The XOM home page is http:
<pathelement location="${junit.jar}"/>
<pathelement location="${jaxen.dir}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${glibj.jar}"/>
</path>
<path id="run.class.path">
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
<property name="parser.jar" value="${lib.dir}/xerces.jar"/>
<property name="jdom-core" value="${build.dest}"/>
<property name="jaxen.lib.dir" value="${lib.dir}"/>
+ <property name="glibj.jar" value="/usr/share/java/glibj.jar"/>
<!-- Compilation class path -->
<path id="compile.class.path">
<pathelement location="${xml-apis.jar}"/>
<pathelement location="${parser.jar}"/>
<pathelement location="${jaxen.lib.dir}"/>
+ <pathelement location="${glibj.jar}"/>
<fileset dir="${jaxen.lib.dir}">
<include name="jaxen-*.jar"/>

171
java150_build.patch
View File

@ -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
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="nu.xom.xslt, nu.xom.canonical, nu.xom.xinclude, nu.xom, nu.xom.converters"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
@@ -437,6 +438,7 @@ XOM Build file
destdir="${build.javadocs}"
author="true"
version="true"
+ source="1.4"
overview="overview.html"
use="true"
splitindex="true"
Index: jdom-1.0/dom4j-1.6.1/build.xml
===================================================================
--- jdom-1.0.orig/dom4j-1.6.1/build.xml
+++ jdom-1.0/dom4j-1.6.1/build.xml
@@ -154,6 +154,7 @@
<!-- =================================================================== -->
<target name="compile-test" depends="compile">
<javac srcdir="${test.dir}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${debug}"
optimize="${optimize}"
@@ -167,6 +168,7 @@
<!-- =================================================================== -->
<target name="samples" depends="compile,prepare-samples,prepare-jaxb">
<javac srcdir="src/samples"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${debug}"
optimize="${optimize}"
@@ -189,6 +191,7 @@
<target name="javadoc" depends="prepare-src">
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
@@ -208,6 +211,7 @@
<target name="release-javadoc" depends="prepare-src">
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
@@ -225,6 +229,7 @@
<mkdir dir="${build.apidocs}"/>
<javadoc packagenames="${api.packages}"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.apidocs}"
author="true"
@@ -351,7 +356,9 @@
<produces dir="${build.generated.src}" />
</xjc>
- <javac destdir="${build.dest}">
+ <javac
+ source="1.4" target="1.4"
+ destdir="${build.dest}">
<src path="${build.generated.src}"/>
<classpath>
<path refid="classpath.jaxb"/>
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"/>
<javac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${compile.debug}"
optimize="${compile.optimize}"
@@ -181,6 +182,7 @@ For instructions on how to build JDOM, p
<target name="about"
description="Compiles the About code">
<javac srcdir="${package.dir}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${compile.debug}"
optimize="${compile.optimize}"
@@ -195,6 +197,7 @@ For instructions on how to build JDOM, p
<target name="samples" depends="prepare-samples,package"
description="Compiles the samples directory">
<javac srcdir="${samples.dest}"
+ source="1.4" target="1.4"
destdir="${samples.dest}"
debug="${compile.debug}"
optimize="${compile.optimize}"
@@ -234,6 +237,7 @@ For instructions on how to build JDOM, p
description="Creates the API documentation">
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
@@ -257,6 +261,7 @@ For instructions on how to build JDOM, p
description="Creates the API documentation with links to JDK 1.4 classes">
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
Index: jdom-1.0/saxpath-1.0-FCS/build.xml
===================================================================
--- jdom-1.0.orig/saxpath-1.0-FCS/build.xml
+++ jdom-1.0/saxpath-1.0-FCS/build.xml
@@ -153,6 +153,7 @@
<!-- =================================================================== -->
<target name="compile" depends="collections">
<javac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${debug}"
optimize="${optimize}"
@@ -164,6 +165,7 @@
<!-- =================================================================== -->
<target name="compile-test" depends="compile">
<javac srcdir="${test.dir}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${debug}"
optimize="${optimize}"
@@ -178,6 +180,7 @@
<!-- =================================================================== -->
<target name="samples" depends="prepare-samples,collections">
<javac srcdir="${build.src}"
+ source="1.4" target="1.4"
destdir="${build.dest}"
debug="${debug}"
optimize="${optimize}"/>
@@ -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 @@
<target name="release-javadoc" depends="prepare-src,collections,doc">
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
+ source="1.4"
sourcepath="${build.src}"
destdir="${build.javadocs}"
author="true"
@@ -254,6 +259,7 @@
author="true"
version="true"
use="true"
+ source="1.4"
splitindex="true"
noindex="false"
windowtitle="${Name} API"

3
jaxen-1.1.1-src.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f037aacfa3fcfa6a255a55b54011130a083bf7d424863ee0dcdb73fe0c265fb
size 200040

12
jdom-1.0-build.xml.patch
View File

@ -1,12 +0,0 @@
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
@@ -73,6 +73,7 @@ For instructions on how to build JDOM, p
<path id="compile.class.path">
<pathelement location="${xml-apis.jar}"/>
<pathelement location="${parser.jar}"/>
+ <pathelement location="${jaxen.lib.dir}"/>
<fileset dir="${jaxen.lib.dir}">
<include name="jaxen-*.jar"/>

3
jdom-1.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:607b1d4b21e64ff7ae40776191d2f6b55ca999c6eecf18e27ccc19f882fae574
size 3449689

21
jdom-1.1-build.xml.patch Normal file
View File

@ -0,0 +1,21 @@
--- jdom-1.1/build.xml
+++ jdom-1.1/build.xml
@@ -39,8 +39,8 @@
<property name="compile.debug" value="true" />
<property name="compile.optimize" value="true" />
- <property name="compile.target" value="1.2" />
- <property name="compile.source" value="1.2" />
+ <property name="compile.target" value="1.5" />
+ <property name="compile.source" value="1.5" />
<property name="compile.deprecation" value="true" />
<property name="src.dir" value="./src/java"/>
@@ -75,6 +75,7 @@
<path id="compile.class.path">
<pathelement location="${xml-apis.jar}"/>
<pathelement location="${parser.jar}"/>
+ <pathelement location="${jaxen.lib.dir}"/>
<fileset dir="${jaxen.lib.dir}">
<include name="jaxen-*.jar"/>

13
jdom-1.1-xom-get-jaxen.patch Normal file
View File

@ -0,0 +1,13 @@
--- XOM/build.xml
+++ XOM/build.xml
@@ -729,7 +729,9 @@
</target>
<target name="get-jaxen" description="Download Jaxen source code" depends="prepare">
- <unzip src="jaxen-1.1-src.zip" dest="${build.dir}" />
+ <copy todir="${build.dir}/jaxen">
+ <fileset dir="../jaxen-1.1.1/" />
+ </copy>
</target>
<target name="debug" depends="init" description="Print various Ant properties">

3
jdom-1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e63a7ef30c644bea97fa255e64773b6e6ee4eb1d5799a9a34f3220533944ee98
size 3336664

25
jdom.changes
View File

@ -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

89
jdom.spec
View File

@ -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