import sources

This commit is contained in:
Adam Samalik 2023-05-16 09:45:19 +02:00
parent 1febcfd639
commit 40c451d6d8
7 changed files with 57 additions and 124 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/ant-contrib-1.0b3-src.tar.bz2
/ant-contrib-1.0b3-src.tar.bz2

View File

@ -1,25 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
<packaging>jar</packaging>
<name>Ant-Contrib Tasks</name>
<version>1.0b3</version>
<url>http://ant-contrib.sourceforge.net</url>
<licenses>
<license>
<url>http://ant-contrib.sourceforge.net/tasks/LICENSE.txt</url>
</license>
</licenses>
<scm>
<url>https://svn.sourceforge.net/svnroot/ant-contrib ant-contrib</url>
</scm>
<description>A collection of tasks (and at one point maybe types and other tools) for Apache Ant</description>
<dependencies>
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.5</version>
</dependency>
</dependencies>
</project>

View File

@ -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>

View File

@ -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

View File

@ -1 +0,0 @@
ant-contrib package is retired for CS-620

View File

@ -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" />

View File

@ -1 +1 @@
SHA1 (ant-contrib-1.0b3-src.tar.bz2) = 23694f563392959d8b152ef86e67747674491761
SHA512 (ant-contrib-1.0b3-src.tar.bz2) = 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8