Fridrich Strba 2018-07-20 12:05:05 +00:00 committed by Git OBS Bridge
parent 59bb0e1bb5
commit 740867cb6d
3 changed files with 40 additions and 1 deletions

29
ws-jaxme-zip.patch Normal file
View File

@ -0,0 +1,29 @@
--- ws-jaxme-0.5.2/ant/js.xml 2006-08-23 10:02:35.000000000 +0200
+++ ws-jaxme-0.5.2/ant/js.xml 2018-07-20 14:01:47.466084001 +0200
@@ -35,16 +35,11 @@
<property name="src.js" location="${basedir}/src/js"/>
<path id="js.class.path">
- <pathelement location="${preqs}/log4j-1.2.8.jar"/>
- <pathelement location="${preqs}/ant-1.5.4.jar"/>
- <pathelement location="${preqs}/junit.jar"/>
- <pathelement location="${preqs}/antlr.jar"/>
<pathelement location="${dist}/jaxmeapi-${version}.jar"/>
</path>
<path id="js.test.path">
<path refid="js.class.path"/>
- <pathelement location="${preqs}/hsqldb-1.7.1.jar"/>
<pathelement location="${dist}/jaxmejs-${version}.jar"/>
<pathelement location="${build.js.test.classes}"/>
</path>
--- ws-jaxme-0.5.2/ant/macros.xml 2005-07-14 20:32:17.000000000 +0200
+++ ws-jaxme-0.5.2/ant/macros.xml 2018-07-20 13:17:45.535704606 +0200
@@ -67,7 +67,6 @@
<sequential>
<mkdir dir="${dist}"/>
<jar destfile="${dist}/@{filename}-${version}.jar" basedir="@{classesdir}"/>
- <zip destfile="${dist}/@{filename}-src-${version}.zip" basedir="@{srcdir}"/>
</sequential>
</macrodef>

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Jul 20 12:03:34 UTC 2018 - fstrba@suse.com
- Added patch:
* ws-jaxme-zip.patch
+ Don't reference in js.xml the dependency jar files by name,
rely on them being on the classpath
-------------------------------------------------------------------
Mon Dec 4 12:03:31 UTC 2017 - thomas.schraitle@suse.com

View File

@ -31,6 +31,7 @@ Patch2: ws-jaxme-java6.patch
Patch3: ws-jaxme-sourcetarget.patch
Patch4: ws-jaxme-use-commons-codec.patch
Patch5: ws-jaxme-0.5.2-proxygenerator.patch
Patch6: ws-jaxme-zip.patch
BuildRequires: ant >= 1.6
BuildRequires: ant-apache-resolver
BuildRequires: antlr
@ -108,6 +109,7 @@ find . -name "*.jar" | xargs rm
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver"
@ -123,7 +125,7 @@ export CLASSPATH=$(build-classpath \
xml-commons-apis \
xml-commons-resolver \
junit)
ant all Docs.all \
ant -v all Docs.all \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dbuild.sysclasspath=first \
-Ddocbook.home=%{_datadir}/xml/docbook \