Compare commits
2 Commits
825eaebc2c
...
24dea62e5e
Author | SHA1 | Date |
---|---|---|
Adam Samalik | 24dea62e5e | |
Adam Samalik | 40c451d6d8 |
|
@ -0,0 +1,2 @@
|
|||
23694f563392959d8b152ef86e67747674491761 ant-contrib-1.0b3-src.tar.bz2
|
||||
2b8b815229aa8a61e483fb4ba0588b8b6c491890 LICENSE-2.0.txt
|
|
@ -1 +1,3 @@
|
|||
SOURCES/ant-contrib-1.0b3-src.tar.bz2
|
||||
ant-contrib-1.0b2-src.tar.gz
|
||||
ant-contrib-1.0b3-src.tar.bz2
|
||||
/LICENSE-2.0.txt
|
||||
|
|
202
LICENSE-2.0.txt
202
LICENSE-2.0.txt
|
@ -1,202 +0,0 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/ant-contrib-1.0b3.pom b/ant-contrib-1.0b3.pom
|
||||
index 59dea4a..ca99233 100644
|
||||
--- a/ant-contrib-1.0b3.pom
|
||||
+++ b/ant-contrib-1.0b3.pom
|
||||
@@ -17,7 +17,7 @@
|
||||
<description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
- <groupId>ant</groupId>
|
||||
+ <groupId>org.apache.ant</groupId>
|
||||
<artifactId>ant</artifactId>
|
||||
<version>1.5</version>
|
||||
</dependency>
|
|
@ -3,28 +3,27 @@
|
|||
Summary: Collection of tasks for Ant
|
||||
Name: ant-contrib
|
||||
Version: 1.0
|
||||
Release: 0.23.%{beta_number}%{?dist}
|
||||
Release: 0.32.%{beta_number}%{?dist}
|
||||
License: ASL 2.0 and ASL 1.1
|
||||
URL: http://ant-contrib.sourceforge.net/
|
||||
Group: Development/Libraries
|
||||
Source0: https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
|
||||
Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
|
||||
# ASL 2.0 Licence text
|
||||
# Upstream bug at https://sourceforge.net/tracker/?func=detail&aid=3590371&group_id=36177&atid=416920
|
||||
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
|
||||
Patch0: local-ivy.patch
|
||||
Patch2: %{name}-antservertest.patch
|
||||
Patch3: %{name}-pom.patch
|
||||
BuildRequires: jpackage-utils >= 1.5
|
||||
BuildRequires: junit >= 3.8.0
|
||||
BuildRequires: ant-junit >= 1.6.2
|
||||
BuildRequires: ivy-local
|
||||
BuildRequires: junit
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: xerces-j2
|
||||
BuildRequires: bcel >= 5.0
|
||||
BuildRequires: java-devel >= 1.4.2
|
||||
BuildRequires: bcel
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: apache-ivy
|
||||
Requires: java >= 1.4.2
|
||||
Requires: junit >= 3.8.0
|
||||
Requires: ant >= 1.6.2
|
||||
BuildRequires: jakarta-commons-httpclient
|
||||
BuildRequires: apache-commons-logging
|
||||
BuildRequires: apache-commons-parent
|
||||
Requires: java-headless
|
||||
Requires: junit
|
||||
Requires: ant
|
||||
Requires: xerces-j2
|
||||
BuildArch: noarch
|
||||
|
||||
|
@ -43,12 +42,8 @@ Api documentation for %{name}.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
%patch0 -b .sav
|
||||
%patch2
|
||||
|
||||
cp %{SOURCE1} %{name}-1.0b3.pom
|
||||
%patch3 -p1
|
||||
|
||||
cp %{SOURCE2} LICENSE-2.0.txt
|
||||
|
||||
find -name '*.class' -exec rm -f '{}' \;
|
||||
|
@ -58,44 +53,63 @@ sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
|
|||
# needs porting to latest ivy
|
||||
rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
|
||||
|
||||
sed -i '/<ivy:configure /d' build.xml
|
||||
rm -f ivy-conf.xml
|
||||
|
||||
sed -i '/<info /s//&revision="1.0b3" /' ivy.xml
|
||||
%mvn_alias : ant-contrib:
|
||||
|
||||
%build
|
||||
ant dist
|
||||
%ant -Divy.mode=local dist
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -Dpm 644 target/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/ant/%{name}.jar
|
||||
|
||||
# javadoc
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
cp -pr target/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
%mvn_artifact ivy.xml target/%{name}.jar
|
||||
%mvn_install -J target/docs/api
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d
|
||||
echo "ant/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
|
||||
echo "ant-contrib/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
|
||||
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
install -pm 644 %{name}-1.0b3.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.ant-%{name}.pom
|
||||
|
||||
%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
|
||||
|
||||
%files
|
||||
%files -f .mfiles
|
||||
%{_sysconfdir}/ant.d/ant-contrib
|
||||
%{_javadir}/ant/*.jar
|
||||
%{_mavenpomdir}/*
|
||||
%{_mavendepmapfragdir}/*
|
||||
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
|
||||
%doc target/docs/manual/tasks/*
|
||||
|
||||
%files javadoc
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 1.0-0.23.b3
|
||||
- Mass rebuild 2013-12-27
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.32.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-0.22.b3
|
||||
- Rebuild to regenerate API documentation
|
||||
- Resolves: CVE-2013-1571
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.31.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.30.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.29.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.28.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Sep 09 2014 Clément David <c.david86@gmail.com> - 1.0-0.27.b3
|
||||
- Fix incorrect ant.d path.
|
||||
|
||||
* Mon Aug 11 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-0.26.b3
|
||||
- Build using XMvn Ivy resolver
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.25.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed May 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0-0.24.b3
|
||||
- Use .mfiles generated during build
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.0-0.23.b3
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.22.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-0.21.b3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
ant-contrib package is retired for CS-620
|
|
@ -1,43 +0,0 @@
|
|||
--- build.xml.sav 2006-11-02 18:44:02.000000000 +0200
|
||||
+++ build.xml 2011-12-15 13:36:38.630460824 +0200
|
||||
@@ -20,22 +20,7 @@
|
||||
<property name="dist.dir" location="dist" />
|
||||
<property name="target.stage.dir" location="${target.dir}/stage" />
|
||||
|
||||
- <target name="init">
|
||||
- <path id="ivy.lib.path">
|
||||
- <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/>
|
||||
- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
|
||||
- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
|
||||
- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
|
||||
- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
|
||||
- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
|
||||
- </path>
|
||||
-
|
||||
- <taskdef resource="fr/jayasoft/ivy/ant/antlib.xml"
|
||||
- uri="antlib:fr.jayasoft.ivy.ant"
|
||||
- classpathref="ivy.lib.path"/>
|
||||
- </target>
|
||||
-
|
||||
- <target name="configure" depends="init">
|
||||
+ <target name="configure" >
|
||||
<ivy:configure file="ivy-conf.xml" />
|
||||
</target>
|
||||
|
||||
--- ivy-conf.xml.sav 2006-10-28 14:57:58.000000000 +0300
|
||||
+++ ivy-conf.xml 2011-12-15 14:35:15.155840710 +0200
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
<resolvers>
|
||||
<filesystem name="local">
|
||||
- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
|
||||
- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
|
||||
+ <ivy pattern="${ivy.conf.dir}/lib/[module]/apache-ivy-[revision].xml" />
|
||||
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
|
||||
</filesystem>
|
||||
|
||||
- <ivyrep name="ivyrep" />
|
||||
+ <ivyrep name="ivyrep" ivyroot="."/>
|
||||
|
||||
<chain name="default-resolver">
|
||||
<resolver ref="local" />
|
3
sources
3
sources
|
@ -1 +1,2 @@
|
|||
SHA1 (ant-contrib-1.0b3-src.tar.bz2) = 23694f563392959d8b152ef86e67747674491761
|
||||
SHA512 (ant-contrib-1.0b3-src.tar.bz2) = 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
|
||||
SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8
|
||||
|
|
Loading…
Reference in New Issue