From 59bb0e1bb598bdf81fecf57a939f5de3e342462f6249be76a144c20002cd6238 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 19:56:06 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=18 --- ws-jaxme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ws-jaxme.spec b/ws-jaxme.spec index 2a42253..32f027b 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -1,7 +1,7 @@ # # spec file for package ws-jaxme # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 740867cb6db6ac02cfceff8c1f1922b40f7d589ef4f2d05e08537da6ecf5c4c0 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 20 Jul 2018 12:05:05 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=19 --- ws-jaxme-zip.patch | 29 +++++++++++++++++++++++++++++ ws-jaxme.changes | 8 ++++++++ ws-jaxme.spec | 4 +++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 ws-jaxme-zip.patch diff --git a/ws-jaxme-zip.patch b/ws-jaxme-zip.patch new file mode 100644 index 0000000..29c5fb2 --- /dev/null +++ b/ws-jaxme-zip.patch @@ -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 @@ + + + +- +- +- +- + + + + + +- + + + +--- 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 @@ + + + +- + + + diff --git a/ws-jaxme.changes b/ws-jaxme.changes index 5116b0b..94f4802 100644 --- a/ws-jaxme.changes +++ b/ws-jaxme.changes @@ -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 diff --git a/ws-jaxme.spec b/ws-jaxme.spec index 32f027b..aca557a 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -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 \ From 006cb65c021b4e7e3b5223f6962680f49a872d1b7a81429ed94098b529950213 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 20 Jul 2018 12:06:24 +0000 Subject: [PATCH 3/5] Try to fix x86 build OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=20 --- ws-jaxme.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ws-jaxme.spec b/ws-jaxme.spec index aca557a..583f96f 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -125,7 +125,7 @@ export CLASSPATH=$(build-classpath \ xml-commons-apis \ xml-commons-resolver \ junit) -ant -v all Docs.all \ +ant all Docs.all \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dbuild.sysclasspath=first \ -Ddocbook.home=%{_datadir}/xml/docbook \ From fd4451806b32dcd88f1e47e0e0382aaa9ea454a6bfc37dfb612592b671385896 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 24 Jul 2018 05:37:50 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=21 --- ws-jaxme-zip.patch | 29 ----------------------------- ws-jaxme.changes | 8 -------- ws-jaxme.spec | 2 -- 3 files changed, 39 deletions(-) delete mode 100644 ws-jaxme-zip.patch diff --git a/ws-jaxme-zip.patch b/ws-jaxme-zip.patch deleted file mode 100644 index 29c5fb2..0000000 --- a/ws-jaxme-zip.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 @@ - - - -- -- -- -- - - - - - -- - - - ---- 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 @@ - - - -- - - - diff --git a/ws-jaxme.changes b/ws-jaxme.changes index 94f4802..5116b0b 100644 --- a/ws-jaxme.changes +++ b/ws-jaxme.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/ws-jaxme.spec b/ws-jaxme.spec index 583f96f..32f027b 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -31,7 +31,6 @@ 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 @@ -109,7 +108,6 @@ 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" From d2f4f01c97164bf0f6fb418d9913d0e667e853f971f016cd48677d97e3d2cd06 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 28 Sep 2018 11:58:43 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ws-jaxme?expand=0&rev=22 --- ws-jaxme.changes | 6 ++++++ ws-jaxme.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ws-jaxme.changes b/ws-jaxme.changes index 5116b0b..2f86797 100644 --- a/ws-jaxme.changes +++ b/ws-jaxme.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 28 11:57:35 UTC 2018 - Fridrich Strba + +- BuildConflict with java-devel >= 11, since it fails intermitently + on i586 with jdk11 + ------------------------------------------------------------------- Mon Dec 4 12:03:31 UTC 2017 - thomas.schraitle@suse.com diff --git a/ws-jaxme.spec b/ws-jaxme.spec index 32f027b..c16ed34 100644 --- a/ws-jaxme.spec +++ b/ws-jaxme.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -47,6 +47,7 @@ BuildRequires: xerces-j2 BuildRequires: xml-commons-apis BuildRequires: xml-commons-resolver BuildRequires: xmldb-api +BuildConflicts: java-devel >= 11 BuildArch: noarch %description