Accepting request 50068 from Java:packages
Copy from Java:packages/ant-contrib based on submit request 50068 from user mvyskocil OBS-URL: https://build.opensuse.org/request/show/50068 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant-contrib?expand=0&rev=9
This commit is contained in:
parent
bd15e4ac23
commit
7d2b07ab21
11
ant-contrib-1.0b2-enable-for-task.patch
Normal file
11
ant-contrib-1.0b2-enable-for-task.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
Index: ant-contrib-1.0b2/ant-contrib/src/net/sf/antcontrib/antcontrib.properties
|
||||||
|
===================================================================
|
||||||
|
--- ant-contrib-1.0b2.orig/ant-contrib/src/net/sf/antcontrib/antcontrib.properties 2005-02-04 01:04:10.000000000 +0100
|
||||||
|
+++ ant-contrib-1.0b2/ant-contrib/src/net/sf/antcontrib/antcontrib.properties 2010-10-08 11:37:40.608761967 +0200
|
||||||
|
@@ -35,5 +35,5 @@
|
||||||
|
remoteant=net.sf.antcontrib.antserver.client.ClientTask
|
||||||
|
|
||||||
|
# Tasks Requiring Ant 1.6 or higher
|
||||||
|
-#for=net.sf.antcontrib.logic.For
|
||||||
|
+for=net.sf.antcontrib.logic.For
|
||||||
|
math=net.sf.antcontrib.math.MathTask
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 8 09:40:42 UTC 2010 - mvyskocil@suse.cz
|
||||||
|
|
||||||
|
- fix bnc#644661 - ant-contrib does not export the antcontrib:for task
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Apr 30 15:49:13 CEST 2009 - mrueckert@suse.de
|
Thu Apr 30 15:49:13 CEST 2009 - mrueckert@suse.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package ant-contrib (Version 1.0b2)
|
# spec file for package ant-contrib (Version 1.0b2)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -25,9 +25,9 @@ Summary: Collection of tasks for Ant
|
|||||||
|
|
||||||
Name: ant-contrib
|
Name: ant-contrib
|
||||||
Version: 1.0b2
|
Version: 1.0b2
|
||||||
Release: 40
|
Release: 47
|
||||||
License: The Apache Software License
|
License: ASLv..
|
||||||
Url: http://ant-contrib.sourceforge.net/
|
Url: http://ant-contrib.sourceforge.net/
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
|
Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-1.0b2-src.tar.bz2
|
||||||
#Is from apache-ant-1.7.0-src.zip
|
#Is from apache-ant-1.7.0-src.zip
|
||||||
@ -35,6 +35,8 @@ Source1: BuildFileTest.java
|
|||||||
Patch0: ant-contrib-build_xml.patch
|
Patch0: ant-contrib-build_xml.patch
|
||||||
Patch1: ant-contrib-ant-1.7.0.patch
|
Patch1: ant-contrib-ant-1.7.0.patch
|
||||||
Patch2: ant-contrib-BuildFileTest_java.patch
|
Patch2: ant-contrib-BuildFileTest_java.patch
|
||||||
|
#PATCH-FIX-OPENSUSE: bnc#644661
|
||||||
|
Patch3: ant-contrib-1.0b2-enable-for-task.patch
|
||||||
BuildRequires: jpackage-utils >= 1.6
|
BuildRequires: jpackage-utils >= 1.6
|
||||||
BuildRequires: ant >= %{ant_minimal_version}
|
BuildRequires: ant >= %{ant_minimal_version}
|
||||||
BuildRequires: bcel >= 5.1
|
BuildRequires: bcel >= 5.1
|
||||||
@ -55,7 +57,7 @@ maybe types and other tools) for Apache Ant.
|
|||||||
|
|
||||||
|
|
||||||
%package javadoc
|
%package javadoc
|
||||||
License: The Apache Software License
|
License: ASLv..
|
||||||
Summary: Collection of tasks for Ant
|
Summary: Collection of tasks for Ant
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
Requires(post): /bin/rm,/bin/ln
|
Requires(post): /bin/rm,/bin/ln
|
||||||
@ -68,7 +70,7 @@ maybe types and other tools) for Apache Ant.
|
|||||||
|
|
||||||
|
|
||||||
%package manual
|
%package manual
|
||||||
License: The Apache Software License
|
License: ASLv..
|
||||||
Summary: Collection of tasks for Ant
|
Summary: Collection of tasks for Ant
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
|
|
||||||
@ -88,6 +90,7 @@ done
|
|||||||
%patch0 -b .sav
|
%patch0 -b .sav
|
||||||
%patch1 -b .sav1
|
%patch1 -b .sav1
|
||||||
%patch2 -b .sav2
|
%patch2 -b .sav2
|
||||||
|
%patch3 -p1 -b .sav2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
pushd ant-contrib/lib
|
pushd ant-contrib/lib
|
||||||
@ -151,20 +154,3 @@ fi
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Apr 30 2009 mrueckert@suse.de
|
|
||||||
- rename ant_version to ant_minimal_version
|
|
||||||
- use requires_eq for the ant package
|
|
||||||
* Thu Apr 30 2009 ro@suse.de
|
|
||||||
- bump ant-version to 1.7.1
|
|
||||||
* Thu Sep 11 2008 mvyskocil@suse.cz
|
|
||||||
- Use a gcc-java to build
|
|
||||||
* Fri Aug 08 2008 mvyskocil@suse.cz
|
|
||||||
- Make junit testing optional and disable it by default to break a build cycle
|
|
||||||
ant-antlr - bsf - jython - mysql-connector-java - ant-contrib ant-contrib
|
|
||||||
* Thu Jul 10 2008 mvyskocil@suse.cz
|
|
||||||
- Removed summary tags from description of subpackages.
|
|
||||||
- Remove the ant-1.7.0 archive to reduce a size of source package and
|
|
||||||
use only one necessary file BuildFileTest.java
|
|
||||||
* Wed Jul 02 2008 mvyskocil@suse.cz
|
|
||||||
- First release based on jpackage.org 1.7 (1.0.b2)
|
|
||||||
- adjusted for ant 1.7.0
|
|
||||||
|
Loading…
Reference in New Issue
Block a user