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

- Fix namespace clash with javapackages-tools on variables

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=16
This commit is contained in:
Tomáš Chvátal 2015-03-24 12:34:52 +00:00 committed by Git OBS Bridge
parent 0a3975bb96
commit f7ad8f011f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdom.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 24 12:34:14 UTC 2015 - tchvatal@suse.com
- Fix namespace clash with javapackages-tools on variables
-------------------------------------------------------------------
Tue Mar 24 11:17:50 UTC 2015 - tchvatal@suse.com

8
jdom.spec
View File

@ -157,8 +157,8 @@ find . -name "*.jar" -delete -name "*.class" -delete
LIBGCJ=$(ls %{_datadir}/java/libgcj* | tail -n1 )
LIBGCJ=$(basename $LIBGCJ)
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVACMD_OPTS="-C -ftarget=1.5"
export JAVACMD="javac ${JAVACMD_OPTS} "
export JAVA_OPTS="-C -ftarget=1.5"
export JAVAC="javac ${JAVA_OPTS} "
i=0
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"
@ -167,7 +167,7 @@ for file in $(find ${SOURCE_DIRS} -name "*.java")
do
i=$((i+1))
echo compiling class \# $i of ${MAX}
${JAVACMD} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file"
${JAVAC} -classpath ${CLASSPATH} -d %{stage1_build_dir} $file || FAILED_FILES="$FAILED_FILES $file"
done
unset CLASSPATH SOURCE_DIRS MAX
@ -184,7 +184,7 @@ pushd %{jaxen_dir}/src/java/main
mkdir build
#mkdir %{_builddir}/jaxen-excluded
#mv org/jaxen/dom4j %{_builddir}/jaxen-excluded
${JAVACMD} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java")
${JAVAC} -classpath $(build-classpath glibj):%{_builddir}/jdom-%{jdom_version}.jar:%{stage1_build_dir} -d build/ $(find . -name "*.java")
cd build
jar -cf %{_builddir}/jaxen-%{jaxen_version}.jar *
popd