From 82f578ea993dddfcb1badb7ea601af0094f3ceba37ce0716b7c0906f5bf9f8df Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar Date: Sat, 26 Apr 2014 13:11:11 +0000 Subject: [PATCH 1/3] Accepting request 231159 from home:deadpoint:branches:Java:packages Update to build with openjdk OBS-URL: https://build.opensuse.org/request/show/231159 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=50 --- ant-antlr.spec | 6 ++---- ant.changes | 5 +++++ ant.spec | 6 ++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ant-antlr.spec b/ant-antlr.spec index a87b28f..f50baf8 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -51,9 +51,7 @@ Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap BuildRequires: gpg-offline -BuildRequires: java-1_5_0-gcj-compat-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 +BuildRequires: java-devel %else BuildRequires: java-devel >= 1.5.0 %endif @@ -506,7 +504,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="-C -Wno-deprecated" +export BOOTJAVAC_OPTS="" sh -x ./build.sh --noconfig jars %endif diff --git a/ant.changes b/ant.changes index 6a7de0a..86266d1 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 23 12:55:35 UTC 2014 - darin@darins.net + +- Update packaging to build the openjdk and not gcj + ------------------------------------------------------------------- Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com diff --git a/ant.spec b/ant.spec index 32d4d92..0d9aece 100644 --- a/ant.spec +++ b/ant.spec @@ -50,9 +50,7 @@ Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap BuildRequires: gpg-offline -BuildRequires: java-1_5_0-gcj-compat-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 +BuildRequires: java-devel %else BuildRequires: java-devel >= 1.5.0 %endif @@ -505,7 +503,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="-C -Wno-deprecated" +export BOOTJAVAC_OPTS="" sh -x ./build.sh --noconfig jars %endif From 895b5780710969560185d255abb77b6fe6a327e047332eae4e850d5430971085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 30 Apr 2014 08:34:23 +0000 Subject: [PATCH 2/3] Accepting request 231783 from home:dirkmueller:branches:Java:packages - remove dependency on gpg-offline (blocks rebuilds and tarball integrity is checked by source-validator anyway, plus it was commented out) - remove apache-ant-bz163689.patch (was not applied anywhere) OBS-URL: https://build.opensuse.org/request/show/231783 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=51 --- ant-antlr.spec | 4 -- ant.changes | 8 ++++ ant.spec | 4 -- apache-ant-bz163689.patch | 91 --------------------------------------- 4 files changed, 8 insertions(+), 99 deletions(-) delete mode 100644 apache-ant-bz163689.patch diff --git a/ant-antlr.spec b/ant-antlr.spec index f50baf8..f7734bb 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -50,7 +50,6 @@ Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap -BuildRequires: gpg-offline BuildRequires: java-devel %else BuildRequires: java-devel >= 1.5.0 @@ -445,9 +444,6 @@ This package contains the javadoc documentation for Apache Ant. %endif %prep -%if %bootstrap -%gpg_verify %{SOURCE1001} -%endif %setup -q -n apache-ant-%{version} #Fixup version find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// diff --git a/ant.changes b/ant.changes index 86266d1..2c69bb0 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com + +- remove dependency on gpg-offline (blocks rebuilds and + tarball integrity is checked by source-validator anyway, plus + it was commented out) +- remove apache-ant-bz163689.patch (was not applied anywhere) + ------------------------------------------------------------------- Wed Apr 23 12:55:35 UTC 2014 - darin@darins.net diff --git a/ant.spec b/ant.spec index 0d9aece..b166b06 100644 --- a/ant.spec +++ b/ant.spec @@ -49,7 +49,6 @@ Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap -BuildRequires: gpg-offline BuildRequires: java-devel %else BuildRequires: java-devel >= 1.5.0 @@ -444,9 +443,6 @@ This package contains the javadoc documentation for Apache Ant. %endif %prep -%if %bootstrap -%gpg_verify %{SOURCE1001} -%endif %setup -q -n apache-ant-%{version} #Fixup version find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// diff --git a/apache-ant-bz163689.patch b/apache-ant-bz163689.patch deleted file mode 100644 index 03048eb..0000000 --- a/apache-ant-bz163689.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java.sav1 2010-02-01 19:37:34.000000000 -0500 -+++ apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java 2010-03-12 12:31:19.002865860 -0500 -@@ -173,32 +173,12 @@ - * @throws Exception on error - */ - public void transform(File infile, File outfile) throws Exception { -- if (transformer == null) { -- createTransformer(); -- } -- -- InputStream fis = null; -- OutputStream fos = null; -- try { -- fis = new BufferedInputStream(new FileInputStream(infile)); -- fos = new BufferedOutputStream(new FileOutputStream(outfile)); -- StreamResult res = new StreamResult(fos); -- // not sure what could be the need of this... -- res.setSystemId(JAXPUtils.getSystemId(outfile)); -- Source src = getSource(fis, infile); -- -- // set parameters on each transformation, maybe something has changed -- //(e.g. value of file name parameter) -- setTransformationParameters(); -- -- transformer.transform(src, res); -- } finally { -- // make sure to close all handles, otherwise the garbage -- // collector will close them...whenever possible and -- // Windows may complain about not being able to delete files. -- FileUtils.close(fis); -- FileUtils.close(fos); -- } -+ if (logger != null) { -+ logger.log("The style task is disabled on this platform"); -+ logger.log( -+ "http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689"); -+ } -+ new FileOutputStream(outfile).close(); - } - - /** ---- apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java.sav1 2010-02-01 19:37:34.000000000 -0500 -+++ apache-ant-1.8.0/src/main/org/apache/tools/ant/taskdefs/optional/XMLValidateTask.java 2010-03-12 12:32:28.812991662 -0500 -@@ -287,45 +287,8 @@ - * @throws BuildException if failonerror is true and an error happens - */ - public void execute() throws BuildException { -- try { -- int fileProcessed = 0; -- if (file == null && (filesets.size() == 0)) { -- throw new BuildException( -- "Specify at least one source - " + "a file or a fileset."); -- } -- -- -- -- if (file != null) { -- if (file.exists() && file.canRead() && file.isFile()) { -- doValidate(file); -- fileProcessed++; -- } else { -- String errorMsg = "File " + file + " cannot be read"; -- if (failOnError) { -- throw new BuildException(errorMsg); -- } else { -- log(errorMsg, Project.MSG_ERR); -- } -- } -- } -- -- for (int i = 0; i < filesets.size(); i++) { -- -- FileSet fs = (FileSet) filesets.elementAt(i); -- DirectoryScanner ds = fs.getDirectoryScanner(getProject()); -- String[] files = ds.getIncludedFiles(); -- -- for (int j = 0; j < files.length; j++) { -- File srcFile = new File(fs.getDir(getProject()), files[j]); -- doValidate(srcFile); -- fileProcessed++; -- } -- } -- onSuccessfulValidation(fileProcessed); -- } finally { -- cleanup(); -- } -+ log("The xmlvalidate task is disabled on this platform"); -+ log("http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=163689"); - } - - /** From 47891f69325dcb7f383c09587f59e12bf49dc913ca72f7ddef6f157d397cc191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 May 2014 09:15:53 +0000 Subject: [PATCH 3/3] - Revert the bootstrap breakage. - Revert the bootstrap breakage. OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=52 --- ant-antlr.changes | 5 +++++ ant-antlr.spec | 6 ++++-- ant.changes | 5 +++++ ant.spec | 6 ++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index e216d8d..90d40c8 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 2 09:01:15 UTC 2014 - tchvatal@suse.com + +- Revert the bootstrap breakage. + ------------------------------------------------------------------- Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com diff --git a/ant-antlr.spec b/ant-antlr.spec index f7734bb..9b0da56 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -50,7 +50,9 @@ Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-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 %else BuildRequires: java-devel >= 1.5.0 %endif @@ -500,7 +502,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="" +export BOOTJAVAC_OPTS="-C -Wno-deprecated" sh -x ./build.sh --noconfig jars %endif diff --git a/ant.changes b/ant.changes index 2c69bb0..0a85a7b 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 2 09:01:02 UTC 2014 - tchvatal@suse.com + +- Revert the bootstrap breakage. + ------------------------------------------------------------------- Thu Apr 24 09:54:12 UTC 2014 - dmueller@suse.com diff --git a/ant.spec b/ant.spec index b166b06..cb8e467 100644 --- a/ant.spec +++ b/ant.spec @@ -49,7 +49,9 @@ Patch0: apache-ant-no-test-jar.patch Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap -BuildRequires: java-devel +BuildRequires: java-1_5_0-gcj-compat-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 %else BuildRequires: java-devel >= 1.5.0 %endif @@ -499,7 +501,7 @@ export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bce export GC_MAXIMUM_HEAP_SIZE="134217728" #128M export JAVA_HOME=%{java_home} export CLASSPATH=$JAVA_HOME/lib/tools.jar -export BOOTJAVAC_OPTS="" +export BOOTJAVAC_OPTS="-C -Wno-deprecated" sh -x ./build.sh --noconfig jars %endif