pool/ant
SHA256
14
0
Fork 2
Code Issues Pull Requests Activity

- Fix building on SLE.

Browse Source 
- Added patch:
  * apache-ant-old-gcj-build.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=57
This commit is contained in:
Tomáš Chvátal
2014-07-04 12:47:43 +00:00
committed by Git OBS Bridge
parent 3ebb6592f8
commit 57700f8c95
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ant.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jul 4 12:47:07 UTC 2014 - tchvatal@suse.com
- Fix building on SLE.
- Added patch:
* apache-ant-old-gcj-build.patch
-------------------------------------------------------------------
Fri Jul 4 11:54:48 UTC 2014 - tchvatal@suse.com

5
ant.spec
View File

@@ -46,6 +46,8 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
%if %bootstrap
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
@@ -394,6 +396,9 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
# When bootstrapping, we don't have junit
%if %bootstrap
%patch0 -p1
%if 0%{?suse_version} < 1200
%patch2 -p1
%endif
%endif
# Fix class-path-in-manifest rpmlint warning

24
apache-ant-old-gcj-build.patch Normal file
View File

@@ -0,0 +1,24 @@
diff -urN apache-ant-1.9.4.old/src/main/org/apache/tools/ant/util/VectorSet.java apache-ant-1.9.4/src/main/org/apache/tools/ant/util/VectorSet.java
--- apache-ant-1.9.4.old/src/main/org/apache/tools/ant/util/VectorSet.java 2014-07-04 14:36:26.370041107 +0200
+++ apache-ant-1.9.4/src/main/org/apache/tools/ant/util/VectorSet.java 2014-07-04 14:44:12.888084246 +0200
@@ -122,7 +122,7 @@
count - index);
}
for (Object o : toAdd) {
- elementData[index++] = o;
+ elementData[index++] = (E) o;
}
elementCount += toAdd.size();
return true;
diff -urN apache-ant-1.9.4.old/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java apache-ant-1.9.4/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java
--- apache-ant-1.9.4.old/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java 2014-07-04 14:36:26.372041107 +0200
+++ apache-ant-1.9.4/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java 2014-07-04 14:42:23.841074163 +0200
@@ -101,7 +101,7 @@
* stored as an array of 128 chars.
*/
public Simple8BitZipEncoding(char[] highChars) {
- this.highChars = highChars.clone();
+ this.highChars = (char[]) highChars.clone();
List<Simple8BitChar> temp =
new ArrayList<Simple8BitChar>(this.highChars.length);