OBS User unknown 2008-05-08 02:28:03 +00:00 committed by Git OBS Bridge
parent 4044cbf3de
commit 220c58b622
6 changed files with 3 additions and 45 deletions

View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Wed May 7 10:45:54 CEST 2008 - mvyskocil@suse.cz
- build using gcj, to allow a openjdk6 bootstrap
- change a source and a target level to 1.5 in build.xml
-------------------------------------------------------------------
Sun Feb 17 20:44:23 CET 2008 - coolo@suse.de

View File

@ -11,8 +11,7 @@
Name: ant-antlr
BuildRequires: ant antlr bcel bsf jaf jakarta-commons-logging javamail jdepend junit log4j oro regexp unzip update-alternatives xalan-j2 xerces-j2
BuildRequires: java-1_5_0-gcj-compat-devel
BuildRequires: ant antlr bcel bsf jaf jakarta-commons-logging java-devel javamail jdepend junit log4j oro regexp unzip update-alternatives xalan-j2 xerces-j2
%define ant_home %{_datadir}/ant
%define ant_name ant
%define section free
@ -32,7 +31,6 @@ Requires: %{ant_name} = %{version}
Conflicts: ant-optional-clean, ant-optional-full
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch150: java150_build.patch
Patch3: apache-ant-%{version}-source-level.patch
BuildArch: noarch
%description
@ -252,7 +250,6 @@ This package contains optional trax tasks for Apache Ant.
# Fix temp directory used for file containing large command strings (> 4k)
# clean jar files
%patch150 -p1
%patch3 -b .sav3
find . -name "*.jar" -exec rm -f {} \;
# -----------------------------------------------------------------------------
@ -264,9 +261,6 @@ export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis
#[ -r %{_sysconfdir}/java/java.conf ] && . %{_sysconfdir}/java/java.conf
#[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
export JAVA_HOME
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh build.sh --noconfig jars javadocs
%install
@ -502,9 +496,6 @@ popd
%{ant_home}/etc/coverage-frames.xsl
%changelog
* Wed May 07 2008 mvyskocil@suse.cz
- build using gcj, to allow a openjdk6 bootstrap
- change a source and a target level to 1.5 in build.xml
* Sun Feb 17 2008 coolo@suse.de
- fix changelog for build service
* Sun Jul 08 2007 dbornkessel@suse.de

View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Wed May 7 10:45:27 CEST 2008 - mvyskocil@suse.cz
- build using gcj, to allow a openjdk6 bootstrap
- change a source and a target level to 1.5 in build.xml
-------------------------------------------------------------------
Tue Aug 14 13:52:03 CEST 2007 - skh@suse.de

View File

@ -12,7 +12,7 @@
Name: ant
BuildRequires: java-1_5_0-gcj-compat-devel unzip xerces-j2 xml-commons-apis-bootstrap
BuildRequires: java-devel unzip xerces-j2 xml-commons-apis-bootstrap
%define ant_home %{_datadir}/ant
%define section free
%define cvs_name apache-%{name}
@ -30,7 +30,6 @@ Source2: %{cvs_name}-%{version}.ant.conf
Patch0: %{name}-%{version}-use_system_libs.patch
Patch1: %{cvs_name}-%{version}-rpm.patch
Patch2: %{name}-%{version}-disable-junit-tests.patch
Patch3: %{cvs_name}-%{version}-source-level.patch
Patch150: java150_build.patch
Requires: xerces-j2 >= 2.7.1-2
Requires: jaxp_parser_impl
@ -122,7 +121,6 @@ Ant.
%patch0
#%patch1
%patch2
%patch3 -b .sav3
#%patch150 -p1
# Fix temp directory used for file containing large command strings (> 4k)
# clean jar files
@ -138,10 +136,7 @@ export CLASSPATH=$(%{_bindir}/build-classpath jaxp_parser_impl xml-commons-apis
#[ -z "$JAVA_HOME" ] && JAVA_HOME=%{_jvmdir}/java
#. /usr/share/java-utils/java-functions
export JAVA_HOME
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export BOOTJAVAC_OPTS="-C -Wno-deprecated"
sh bootstrap.sh
export CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
sh bootstrap.sh
sh build.sh --noconfig jars javadocs
# -----------------------------------------------------------------------------
@ -232,9 +227,6 @@ rm -rf $RPM_BUILD_ROOT
# -----------------------------------------------------------------------------
%changelog
* Wed May 07 2008 mvyskocil@suse.cz
- build using gcj, to allow a openjdk6 bootstrap
- change a source and a target level to 1.5 in build.xml
* Tue Aug 14 2007 skh@suse.de
- disable junit tests and remove junit from BuildRequires to break
circular build dependency

View File

@ -1,13 +0,0 @@
--- build.xml
+++ build.xml
@@ -64,8 +64,8 @@
<property name="chmod.maxparallel" value="250"/>
<property name="deprecation" value="false"/>
<property name="optimize" value="true"/>
- <property name="javac.target" value="1.2"/>
- <property name="javac.source" value="1.2"/>
+ <property name="javac.target" value="1.5"/>
+ <property name="javac.source" value="1.5"/>
<property name="junit.fork" value="false"/>
<property name="junit.filtertrace" value="off"/>
<property name="junit.summary" value="no"/>

0
ready Normal file
View File