pool/ant
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 232397 from Java:packages

Browse Source 
- Revert the bootstrap breakage.

- Revert the bootstrap breakage.

- 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)

- Update packaging to build the openjdk and not gcj

OBS-URL: https://build.opensuse.org/request/show/232397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=50
This commit is contained in:
Stephan Kulow 2014-05-02 11:53:57 +00:00 committed by Git OBS Bridge
commit 1845d2440d
5 changed files with 23 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ant-antlr.changes
View File

@ -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

4
ant-antlr.spec
View File

@ -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-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
@ -447,9 +446,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//

18
ant.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
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
- 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
- Update packaging to build the openjdk and not gcj
-------------------------------------------------------------------
Thu Jan 2 08:36:18 UTC 2014 - mvyskocil@suse.com

4
ant.spec
View File

@ -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-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
@ -446,9 +445,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//

91
apache-ant-bz163689.patch
View File

@ -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 <code>failonerror</code> 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");
}
/**