From f9ed3b6df5cc24a2e1e23c3a2483bbc27d0b1f2541ad783148caccc7769d9f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 5 Jan 2017 15:29:47 +0000 Subject: [PATCH 1/4] - Build with java-devel and not gcj as it is getting deprecated - Add patch to build with new javac: * build-encoding.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=23 --- bcel.changes | 7 +++++++ bcel.spec | 7 +++++-- build-encoding.patch | 20 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 build-encoding.patch diff --git a/bcel.changes b/bcel.changes index 4aa73cc..084d772 100644 --- a/bcel.changes +++ b/bcel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 5 15:28:49 UTC 2017 - tchvatal@suse.com + +- Build with java-devel and not gcj as it is getting deprecated +- Add patch to build with new javac: + * build-encoding.patch + ------------------------------------------------------------------- Wed Mar 25 09:22:33 UTC 2015 - tchvatal@suse.com diff --git a/bcel.spec b/bcel.spec index f2af3ac..413c91f 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,7 +1,7 @@ # # spec file for package bcel # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -26,8 +26,10 @@ Url: http://commons.apache.org/proper/commons-bcel/ Source0: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc Source2: bcel.keyring +# set encoding for javac as otherwise it gets interpreted as utf8 and fail +Patch0: build-encoding.patch BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: regexp #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 @@ -69,6 +71,7 @@ find . -name "*.jar" -exec rm -f {} \; # very broken build perl -p -i -e 's| depends=\"examples\"||g;' build.xml touch manifest.txt +%patch0 -p1 %build export CLASSPATH=%(build-classpath regexp) diff --git a/build-encoding.patch b/build-encoding.patch new file mode 100644 index 0000000..6b7adf6 --- /dev/null +++ b/build-encoding.patch @@ -0,0 +1,20 @@ +Index: bcel-5.2/build.xml +=================================================================== +--- bcel-5.2.orig/build.xml ++++ bcel-5.2/build.xml +@@ -39,7 +39,7 @@ + + + +- ++ + + + +@@ -121,4 +121,4 @@ + + + +- +\ No newline at end of file ++ From 3a0ef5ba45d0537199a890383f2ef93600ba110a75e549a428c38b81d83714df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 13 Feb 2017 15:19:55 +0000 Subject: [PATCH 2/4] Accepting request 456867 from Java:packages OBS-URL: https://build.opensuse.org/request/show/456867 OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=24 --- bcel.changes | 7 ------- bcel.spec | 7 ++----- build-encoding.patch | 20 -------------------- 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 build-encoding.patch diff --git a/bcel.changes b/bcel.changes index 084d772..4aa73cc 100644 --- a/bcel.changes +++ b/bcel.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 5 15:28:49 UTC 2017 - tchvatal@suse.com - -- Build with java-devel and not gcj as it is getting deprecated -- Add patch to build with new javac: - * build-encoding.patch - ------------------------------------------------------------------- Wed Mar 25 09:22:33 UTC 2015 - tchvatal@suse.com diff --git a/bcel.spec b/bcel.spec index 413c91f..f2af3ac 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,7 +1,7 @@ # # spec file for package bcel # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -26,10 +26,8 @@ Url: http://commons.apache.org/proper/commons-bcel/ Source0: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz Source1: http://www.apache.org/dist/commons/bcel/source/%{name}-%{version}-src.tar.gz.asc Source2: bcel.keyring -# set encoding for javac as otherwise it gets interpreted as utf8 and fail -Patch0: build-encoding.patch BuildRequires: ant -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-devel BuildRequires: regexp #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 @@ -71,7 +69,6 @@ find . -name "*.jar" -exec rm -f {} \; # very broken build perl -p -i -e 's| depends=\"examples\"||g;' build.xml touch manifest.txt -%patch0 -p1 %build export CLASSPATH=%(build-classpath regexp) diff --git a/build-encoding.patch b/build-encoding.patch deleted file mode 100644 index 6b7adf6..0000000 --- a/build-encoding.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: bcel-5.2/build.xml -=================================================================== ---- bcel-5.2.orig/build.xml -+++ bcel-5.2/build.xml -@@ -39,7 +39,7 @@ - - - -- -+ - - - -@@ -121,4 +121,4 @@ - - - -- -\ No newline at end of file -+ From a821037692479545cadbbfc2a93955fca3fe954814f3c6dd8a8c1f3420cac247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 16:55:29 +0000 Subject: [PATCH 3/4] - Buildignore more java implementations OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=25 --- bcel.changes | 5 +++++ bcel.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bcel.changes b/bcel.changes index 4aa73cc..d368d0e 100644 --- a/bcel.changes +++ b/bcel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 19 16:56:30 UTC 2017 - tchvatal@suse.com + +- Buildignore more java implementations + ------------------------------------------------------------------- Wed Mar 25 09:22:33 UTC 2015 - tchvatal@suse.com diff --git a/bcel.spec b/bcel.spec index f2af3ac..71042f5 100644 --- a/bcel.spec +++ b/bcel.spec @@ -1,7 +1,7 @@ # # spec file for package bcel # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -34,6 +34,8 @@ BuildRequires: regexp #!BuildIgnore: xml-commons-jaxp-1.3-apis #!BuildIgnore: java-1_6_0-openjdk-devel #!BuildIgnore: java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk-devel #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap Requires: regexp From ec50d1b7cfca187017b5eb687dc591c89eaeaec6c667e4bdc89454255eb4a506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 20 May 2017 18:01:01 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/bcel?expand=0&rev=26 --- bcel.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bcel.spec b/bcel.spec index 71042f5..ca6fbaf 100644 --- a/bcel.spec +++ b/bcel.spec @@ -32,10 +32,10 @@ BuildRequires: regexp #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xml-commons-apis xml-commons-resolver xml-commons xerces-j2 #!BuildIgnore: xml-commons-jaxp-1.3-apis -#!BuildIgnore: java-1_6_0-openjdk-devel -#!BuildIgnore: java-1_7_0-openjdk-devel -#!BuildIgnore: java-1_8_0-openjdk-devel -#!BuildIgnore: java-9-openjdk-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap Requires: regexp