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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=29

Browse Source
This commit is contained in:
Fridrich Strba 2018-11-20 10:59:59 +00:00 committed by Git OBS Bridge
parent ad6f3adfd1
commit 32c3d497af
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include-glibj.jar.patch
View File

@ -1,10 +0,0 @@
--- 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"/>
+ <property name="glibj.jar" value="/usr/share/java/glibj.jar"/>
<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*"/>

8
jdom.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 20 10:58:51 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Removed patch:
* include-glibj.jar.patch
+ The build works since ages without glibj being present, so
removing any trace of it
-------------------------------------------------------------------
Tue Nov 20 09:32:18 UTC 2018 - Fridrich Strba <fstrba@suse.com>

10
jdom.spec
View File

@ -56,7 +56,6 @@ Source11: http://repo.maven.apache.org/maven2/saxpath/saxpath/%{saxpath_ve
Source12: http://repo.maven.apache.org/maven2/xom/xom/1.2.5/xom-1.2.5.pom
Source13: http://repo.maven.apache.org/maven2/jaxen/jaxen/%{jaxen_version}%{jaxen_suffix}/jaxen-%{jaxen_version}%{jaxen_suffix}.pom
Patch0: jdom-1.1-build.xml.patch
Patch1: include-glibj.jar.patch
Patch2: jdom-1.1-xom-get-jaxen.patch
BuildRequires: ant
BuildRequires: ant-junit
@ -157,7 +156,6 @@ mkdir %{stage1_build_dir}
# delete all inlcuded jar files:
find . -name "*.jar" -delete -name "*.class" -delete
%patch0
%patch1
%patch2
cp %{SOURCE10} %{name}-%{jdom_version}.pom
cp %{SOURCE11} saxpath-%{saxpath_version}.pom
@ -191,7 +189,6 @@ unset CLASSPATH SOURCE_DIRS SOURCE_PATH
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} \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
package
@ -201,14 +198,14 @@ pushd %{jaxen_dir}/src/java/main
mkdir build
#mkdir %{_builddir}/jaxen-excluded
#mv org/jaxen/dom4j %{_builddir}/jaxen-excluded
${JAVAC} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java" | xargs)
${JAVAC} -classpath %{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java" | xargs)
cd build
jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar *
popd
pushd %{saxpath_dir}
mkdir src/conf
touch src/conf/MANIFEST.MF
CLASSPATH=$(build-classpath glibj):%{_builddir}/jaxen-%{jaxen_version}.jar:%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} ant package
CLASSPATH=%{_builddir}/jaxen-%{jaxen_version}.jar:%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} ant package
mv build/saxpath.jar %{_builddir}/saxpath-%{saxpath_version}.jar
popd
pushd %{xom_dir}
@ -221,8 +218,7 @@ ant \
-Djunit.jar=$(build-classpath junit) \
-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 \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
compile compile15 jar
mv build/xom-%{xom_version}.jar %{_builddir}
popd