diff --git a/.ant-contrib.metadata b/.ant-contrib.metadata new file mode 100644 index 0000000..9681bf0 --- /dev/null +++ b/.ant-contrib.metadata @@ -0,0 +1 @@ +23694f563392959d8b152ef86e67747674491761 SOURCES/ant-contrib-1.0b3-src.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/LICENSE-2.0.txt b/SOURCES/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/SOURCES/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + 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. diff --git a/SOURCES/ant-contrib-1.0b3.pom b/SOURCES/ant-contrib-1.0b3.pom new file mode 100644 index 0000000..59dea4a --- /dev/null +++ b/SOURCES/ant-contrib-1.0b3.pom @@ -0,0 +1,25 @@ + + 4.0.0 + ant-contrib + ant-contrib + jar + Ant-Contrib Tasks + 1.0b3 + http://ant-contrib.sourceforge.net + + + http://ant-contrib.sourceforge.net/tasks/LICENSE.txt + + + + https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib + + A collection of tasks (and at one point maybe types and other tools) for Apache Ant + + + ant + ant + 1.5 + + + diff --git a/SOURCES/ant-contrib-antservertest.patch b/SOURCES/ant-contrib-antservertest.patch new file mode 100644 index 0000000..a486712 --- /dev/null +++ b/SOURCES/ant-contrib-antservertest.patch @@ -0,0 +1,27 @@ +--- test/resources/antserver/antservertest.xml.orig 2005-02-03 19:04:11.000000000 -0500 ++++ test/resources/antserver/antservertest.xml 2006-06-01 11:57:05.000000000 -0400 +@@ -3,8 +3,8 @@ + + + +- +- ++ ++ + + + +@@ -124,11 +124,11 @@ + + + +- ++ + + + +- ++ + + + diff --git a/SOURCES/ant-contrib-pom.patch b/SOURCES/ant-contrib-pom.patch new file mode 100644 index 0000000..e6d42f3 --- /dev/null +++ b/SOURCES/ant-contrib-pom.patch @@ -0,0 +1,13 @@ +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 @@ + A collection of tasks (and at one point maybe types and other tools) for Apache Ant + + +- ant ++ org.apache.ant + ant + 1.5 + diff --git a/SOURCES/local-ivy.patch b/SOURCES/local-ivy.patch new file mode 100644 index 0000000..a8627e7 --- /dev/null +++ b/SOURCES/local-ivy.patch @@ -0,0 +1,43 @@ +--- 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 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ + + + +--- 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 @@ + + + +- +- ++ ++ + + +- ++ + + + diff --git a/SPECS/ant-contrib.spec b/SPECS/ant-contrib.spec new file mode 100644 index 0000000..ff8bfed --- /dev/null +++ b/SPECS/ant-contrib.spec @@ -0,0 +1,198 @@ +%global beta_number b3 + +Summary: Collection of tasks for Ant +Name: ant-contrib +Version: 1.0 +Release: 0.22.%{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: xerces-j2 +BuildRequires: bcel >= 5.0 +BuildRequires: java-devel >= 1.4.2 +BuildRequires: apache-ivy +Requires: java >= 1.4.2 +Requires: junit >= 3.8.0 +Requires: ant >= 1.6.2 +Requires: xerces-j2 +BuildArch: noarch + +%description +The Ant-Contrib project is a collection of tasks +(and at one point maybe types and other tools) +for Apache Ant. + +%package javadoc +Summary: Javadoc for %{name} +Group: Documentation +Requires: jpackage-utils + +%description javadoc +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 '{}' \; +find -name '*.jar' -exec rm -f '{}' \; + +sed -i "s|xercesImpl|xerces-j2|g" ivy.xml +# needs porting to latest ivy +rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java + +%build +ant 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} + +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ant.d +echo "ant/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 +%{_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 +%doc target/docs/LICENSE.txt LICENSE-2.0.txt +%doc %{_javadocdir}/%{name} + +%changelog +* Fri Jun 28 2013 Mikolaj Izdebski - 1.0-0.22.b3 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.0-0.21.b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Nov 27 2012 Tomas Radej - 1.0-0.20.b3 +- Added ASL 1.1 licence to the licence field + +* Tue Nov 27 2012 Tomas Radej - 1.0-0.19.b3 +- Added LICENSE to javadoc (#879349) +- Added ASL 2.0 licence text (#879354) +- Added requires on jpackage-utils in javadoc (#879356) + +* Tue Nov 13 2012 Tomas Radej - 1.0-0.18.b3 +- Used correct upstream pom + patched it + +* Wed Jul 18 2012 Fedora Release Engineering - 1.0-0.17.b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.0-0.16.b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 15 2011 Alexander Kurtakov 1.0-0.15.b3 +- Update to beta 3. + +* Tue Nov 29 2011 Alexander Kurtakov 1.0-0.14.b2 +- Fix pom installed name. + +* Fri Nov 25 2011 Alexander Kurtakov 1.0-0.13.b2 +- Adapt to current guidelines. + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0-0.12.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 14 2011 Alexander Kurtakov 1.0-0.11.b2 +- Add maven pom and depmap. + +* Fri Sep 4 2009 Alexander Kurtakov 1.0-0.10.b2 +- Install ant contrib in ant.d. + +* Fri Sep 4 2009 Alexander Kurtakov 1.0-0.9.b2 +- Drop gcj_support. +- Install as proper ant plugin. + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0-0.8.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.0-0.7.b2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 14 2008 Tom "spot" Callaway - 1.0-0.6.b2 +- fix license tag + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0-0.5.b2 +- Autorebuild for GCC 4.3 + +* Sun Aug 03 2006 Igor Foox - 1.0-0.4.b2 +- Added dist tag to release. + +* Sat Aug 02 2006 Igor Foox - 1.0-0.3.b2 +- Removed unneccessary 0 epoch from required packages. +- Fixed dependance on specifically version 3.8.1 of junit. + +* Tue Jun 27 2006 Igor Foox - 1.0-0.2.b2 +- Removed Class-Path from ant-contrib.jar file. +- Renamed patches. + +* Tue Jun 27 2006 Igor Foox - 1.0-0.1.b2 +- Fixed release number to reflect beta status +- Removed Distribution and Vendor tags +- Fixed duplication in postun section +- Removed patch3, and used sed to fix line-endings instead + +* Tue Jun 27 2006 Igor Foox - 1.0-1.b2 +- Changed release-version to comply with FE standards +- Consolidated into -manual into main package +- Removed ghosting of the manual symlink +- Removed Epoch +- Run dos2unix over some manual files that have windows line endings +- Changed group for docs to Documentation +- Remove unused Source1 +- Set Source0 to valid URL instead of just a file name +- Fix indentation +- Remove {push,pop}d and -c from %%setup +- Changed %%defattr in the %%files section to standard (-,root,root,-) + +* Thu Jun 1 2006 Igor Foox - 0:1.0b2-1jpp_1fc +- Update to version 1.0b2 +- Added native compilation +- Changed BuildRoot to what Extras expects + +* Fri Aug 20 2004 Ralph Apel - 0:0.6-4jpp +- Upgrade to ant-1.6.2 +- BuildReq/Req ant = 0:1.6.2 +- Relax some other requirements + +* Thu Jun 03 2004 Paul Nasrat - 0:0.6-3jpp +- Fix missing buildrequires + +* Tue Jun 01 2004 Randy Watler - 0:0.6-2jpp +- Upgrade to Ant 1.6.X + +* Wed Mar 24 2004 Ralph Apel - 0:0.6-1jpp +- First JPackage release