Compare commits

...
Sign in to create a new pull request.

13 commits

Author SHA1 Message Date
Fedora Release Engineering
350aea5506 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:44:33 +00:00
Jiri Vanek
30adc7a044 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-28 18:48:27 +02:00
Fedora Release Engineering
d7da09ad8a Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 17:03:19 +00:00
Fedora Release Engineering
cf34b5d0ed Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 11:10:41 +00:00
Fedora Release Engineering
8fac9aceba Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 17:06:35 +00:00
Fedora Release Engineering
ac4deb79fc Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 23:09:22 +00:00
Fedora Release Engineering
d285ad78e9 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 13:05:01 +00:00
Zdenek Zambersky
36f8f7a171 Added ExclusiveArch 2023-08-01 13:05:34 +02:00
Zdenek Zambersky
9b58f258bb Fixed build on latest fedora
fixes: rhbz#2217892
2023-08-01 12:08:24 +02:00
d549808f3a Unretirement request: https://pagure.io/releng/issue/11501 2023-08-01 11:09:32 +02:00
Miro Hrončok
198afd98d6 Orphaned for 6+ weeks 2021-09-07 11:47:51 +02:00
Fedora Release Engineering
52e7e1b5af - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 17:38:37 +00:00
Fedora Release Engineering
4d4d386d9d - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 12:42:47 +00:00
2 changed files with 58 additions and 17 deletions

View file

@ -1,5 +1,7 @@
--- 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
diff --git a/test/resources/antserver/antservertest.xml b/test/resources/antserver/antservertest.xml
index 77f8db0..c51fad0 100644
--- a/test/resources/antserver/antservertest.xml
+++ b/test/resources/antserver/antservertest.xml
@@ -3,8 +3,8 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>

View file

@ -3,8 +3,10 @@
Summary: Collection of tasks for Ant
Name: ant-contrib
Version: 1.0
Release: 0.40.%{beta_number}%{?dist}
License: ASL 2.0 and ASL 1.1
Release: 0.50.%{beta_number}%{?dist}
# Project site on sf lists both Apache Software License, Apache License V2.0
# see: https://sourceforge.net/projects/ant-contrib/
License: Apache-2.0 AND Apache-1.1
URL: http://ant-contrib.sourceforge.net/
Source0: https://downloads.sourceforge.net/project/ant-contrib/ant-contrib/1.0b3/ant-contrib-1.0b3-src.tar.bz2
@ -15,23 +17,23 @@ Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch2: ant-contrib-antservertest.patch
Patch3: ant-contrib-java-8.patch
BuildRequires: ivy-local
BuildRequires: ivy-local, ant-openjdk25 , ant-openjdk25
BuildRequires: junit
BuildRequires: ant-junit
BuildRequires: xerces-j2
BuildRequires: bcel
BuildRequires: java-devel
BuildRequires: java-25-devel
BuildRequires: apache-ivy
BuildRequires: jakarta-commons-httpclient
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-parent
Requires: java-headless
Requires: java-25-headless
Requires: junit
Requires: ant
Requires: ant-openjdk25
Requires: xerces-j2
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
%description
The Ant-Contrib project is a collection of tasks
@ -40,28 +42,32 @@ for Apache Ant.
%package javadoc
Summary: Javadoc for %{name}
Requires: jpackage-utils
%description javadoc
Api documentation for %{name}.
%prep
%setup -q -n %{name}
%patch2
%patch3 -p1
%autopatch -p1
cp %{SOURCE2} LICENSE-2.0.txt
cp -p %{SOURCE2} LICENSE-2.0.txt
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
find -name '*.class' -delete
find -name '*.jar' -delete
sed -i "s|xercesImpl|xerces-j2|g" ivy.xml
# needs porting to latest ivy
rm -fr src/java/net/sf/antcontrib/net/URLImportTask.java
# remove httpclient stuff
rm -fr src/java/net/sf/antcontrib/net/httpclient
sed -i '/<ivy:configure /d' build.xml
rm -f ivy-conf.xml
sed -i 's/antlib:fr.jayasoft.ivy.ant/antlib:org.apache.ivy.ant/g' build.xml
sed -i 's/org="jayasoft"/org="org.apache.ivy"/g' ivy.xml
sed -i '/<dependency org="apache"/{N;N;N;/commons-httpclient/d}' ivy.xml
sed -i '/<info /s//&revision="1.0b3" /' ivy.xml
%mvn_alias : ant-contrib:
@ -77,13 +83,46 @@ echo "ant-contrib/ant-contrib" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/ant-contrib
%files -f .mfiles
%{_sysconfdir}/ant.d/ant-contrib
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
%license target/docs/LICENSE.txt LICENSE-2.0.txt
%doc target/docs/manual/tasks/*
%files javadoc -f .mfiles-javadoc
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
%license target/docs/LICENSE.txt LICENSE-2.0.txt
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.50.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Jul 28 2025 jiri vanek <jvanek@redhat.com> - 1.0-0.49.b3
- Rebuilt for java-25-openjdk as preffered jdk
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.48.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.47.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.46.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.45.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.44.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Aug 1 2023 Zdenek Zambersky <zzambers@redhat.com> - 1.0-0.43.b3
- added ExclusiveArch
* Wed Jul 26 2023 Zdenek Zambersky <zzambers@redhat.com> - 1.0-0.42.b3
- fixed build problems with goal to unretire package
- removed dependency on deprecated/removed commons-httpclient
- fixed ivy org/namespace
- fixes based on re-review
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.41.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-0.40.b3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild