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
This commit is contained in:
Tomáš Chvátal
Git OBS Bridge
parent
05775eedad
commit
c710b4f92e
@ -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//
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
4
ant.spec
4
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//
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
/**
|
||||
Loading…
x
Reference in New Issue
Block a user