forked from pool/ant-contrib
Compare commits
20 Commits
2d1ffa2c1d
...
e22bda8bcf
| Author | SHA256 | Date | |
|---|---|---|---|
| e22bda8bcf | |||
| 8ffcbdee22 | |||
| f4159207a6 | |||
| ad2fd666b0 | |||
| b8537f577b | |||
| 9ed1ee6996 | |||
| f53908f29a | |||
| 1ea9162783 | |||
| c392314631 | |||
| 0940923480 | |||
| ab16b12f2e | |||
| f0cc591388 | |||
| 8a77dc30bb | |||
| 5531cd593e | |||
|
48d0232b63 | ||
|
|
5ff8bfbec3 | ||
|
|
67bbb97fd0 | ||
|
|
3258b7c3a9 | ||
|
|
bbabbf29cf | ||
|
9ef6c7da2d |
@@ -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>
|
||||
@@ -6,5 +6,5 @@
|
||||
ivy.deliver.revision=${project.version}
|
||||
-jdk.source=1.4
|
||||
-jdk.target=1.4
|
||||
+jdk.source=1.6
|
||||
+jdk.target=1.6
|
||||
+jdk.source=8
|
||||
+jdk.target=8
|
||||
|
||||
@@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 20 10:55:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Use %patch -P N instead of deprecated %patchN.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 17 11:05:25 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Clean the spec file a bit
|
||||
- Removed patch:
|
||||
* ant-contrib-pom.patch
|
||||
+ not needed any more with the javapackages-tools >= 6
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 8 08:48:39 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Modified patch:
|
||||
* local-ivy.patch
|
||||
+ fix build with apache-ivy 2.5.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 15 05:45:46 UTC 2018 - fstrba@suse.com
|
||||
|
||||
- Build with source and target 8 to prepare for a possible removal
|
||||
of 1.6 compatibility
|
||||
- Run fdupes on the documentation
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 6 18:17:00 UTC 2017 - fstrba@suse.com
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ant-contrib
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@@ -22,31 +22,29 @@ Release: 0
|
||||
Summary: Collection of tasks for Ant
|
||||
License: Apache-2.0
|
||||
Group: Development/Libraries/Java
|
||||
Url: http://ant-contrib.sourceforge.net/
|
||||
Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
|
||||
Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
|
||||
URL: https://ant-contrib.sourceforge.net/
|
||||
Source0: https://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
|
||||
Source1: https://repo1.maven.org/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
|
||||
Patch1: ant-contrib-antservertest.patch
|
||||
Patch2: ant-contrib-pom.patch
|
||||
Patch3: ant-contrib-1.0b3-enable-for-task.patch
|
||||
Patch4: ant-contrib-sourcetarget.patch
|
||||
Patch2: ant-contrib-1.0b3-enable-for-task.patch
|
||||
Patch3: ant-contrib-sourcetarget.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-ivy
|
||||
BuildRequires: bcel >= 5.1
|
||||
BuildRequires: commons-httpclient
|
||||
BuildRequires: commons-logging
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: junit
|
||||
BuildRequires: xerces-j2
|
||||
Requires: junit >= 3.8.1
|
||||
Requires: xerces-j2
|
||||
%requires_eq ant
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@@ -70,13 +68,14 @@ Api documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
cp %{SOURCE1} %{name}-1.0b3.pom
|
||||
cp %{SOURCE1} %{name}-%{version}.pom
|
||||
cp %{SOURCE2} LICENSE-2.0.txt
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch -P 0
|
||||
%patch -P 1
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
|
||||
%pom_change_dep ant: org.apache.ant %{name}-%{version}.pom
|
||||
|
||||
find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +
|
||||
|
||||
@@ -85,7 +84,7 @@ sed -i "s|xercesImpl|xerces-j2|g" ivy.xml ||:
|
||||
rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
|
||||
|
||||
%build
|
||||
ant dist
|
||||
%{ant} dist
|
||||
|
||||
%install
|
||||
# jars
|
||||
@@ -94,31 +93,26 @@ install -Dpm 644 target/%{name}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
|
||||
# javadoc
|
||||
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr target/docs/api/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
|
||||
echo "ant/ant-contrib" > %{buildroot}%{_sysconfdir}/ant.d/ant-contrib
|
||||
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 644 %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom
|
||||
|
||||
echo "call add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar"
|
||||
%{mvn_install_pom} %{name}-1.0b3.pom %{buildroot}/%{_mavenpomdir}/JPP.ant-%{name}.pom
|
||||
%add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar
|
||||
|
||||
%files
|
||||
%files -f .mfiles
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
|
||||
%license target/docs/LICENSE.txt LICENSE-2.0.txt
|
||||
%config %{_sysconfdir}/ant.d/%{name}
|
||||
%{_javadir}/ant/%{name}.jar
|
||||
%{_mavenpomdir}/JPP.ant-%{name}.pom
|
||||
%{_datadir}/maven-metadata/%{name}.xml
|
||||
|
||||
%files manual
|
||||
%defattr(-,root,root,-)
|
||||
%doc target/docs/manual/tasks/*
|
||||
|
||||
%files javadoc
|
||||
%defattr(-,root,root,-)
|
||||
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
|
||||
%license target/docs/LICENSE.txt
|
||||
%doc LICENSE-2.0.txt
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -1,5 +1,14 @@
|
||||
--- build.xml.sav 2006-11-02 18:44:02.000000000 +0200
|
||||
+++ build.xml 2011-12-15 13:36:38.630460824 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
name="ant-contrib"
|
||||
default="dist"
|
||||
basedir="."
|
||||
- xmlns:ivy="antlib:fr.jayasoft.ivy.ant">
|
||||
+ xmlns:ivy="antlib:org.apache.ivy.ant">
|
||||
|
||||
<property file="build.properties" />
|
||||
|
||||
@@ -20,22 +20,7 @@
|
||||
<property name="dist.dir" location="dist" />
|
||||
<property name="target.stage.dir" location="${target.dir}/stage" />
|
||||
|
||||
Reference in New Issue
Block a user