rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=151

Browse Source
This commit is contained in:
Fridrich Strba 2019-11-09 08:35:14 +00:00 committed by Git OBS Bridge
parent e2a0be8d6e
commit 95d8761dd6
8 changed files with 88 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ant-antlr.changes
View File

@ -8,6 +8,8 @@ Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
* apache-ant-xml-apis.patch
* reproducible-build-manifest.patch
+ rediff
- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
package
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>

25
ant-antlr.spec
View File

@ -64,6 +64,7 @@ BuildRequires: junit
%endif
%if %{with antlr}
BuildRequires: xerces-j2
BuildRequires: xz-java
%endif
%if %{with junit5}
BuildRequires: apiguardian
@ -88,8 +89,6 @@ Provides: ant-trax = %{version}
%if %{with antlr}
Requires: antlr
%requires_eq ant
Provides: ant-antlr = %{version}-%{release}
Provides: ant-xz = %{version}-%{release}
Obsoletes: ant-javadoc
%endif
%if %{with junit}
@ -330,6 +329,18 @@ Apache Ant is a Java-based build tool.
This package contains optional jsch tasks for Apache Ant.
%package -n ant-xz
Summary: Opional xz tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: xz-java
%requires_eq ant
%description -n ant-xz
Apache Ant is a Java-based build tool.
This package contains optional xz tasks for Apache Ant.
%package -n ant-testutil
Summary: Test utility classes for ant
License: Apache-2.0
@ -388,7 +399,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
%endif
# Fix file-not-utf8 rpmlint warning
@ -504,7 +515,7 @@ do
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
else
%if %{with junit} || %{with junit5}
@ -576,6 +587,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
@ -633,7 +645,6 @@ popd
%if %{with antlr}
%files -f .mfiles
%{ant_home}/lib/ant-antlr.jar
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%endif
@ -724,6 +735,10 @@ popd
%{ant_home}/lib/ant-jsch.jar
%config(noreplace) %{_sysconfdir}/ant.d/jsch
%files -n ant-xz -f .mfiles-ant-xz
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/xz
%files -n ant-testutil -f .mfiles-ant-testutil
%{ant_home}/lib/ant-testutil.jar
%config(noreplace) %{_sysconfdir}/ant.d/testutil

2
ant-junit.changes
View File

@ -8,6 +8,8 @@ Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
* apache-ant-xml-apis.patch
* reproducible-build-manifest.patch
+ rediff
- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
package
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>

25
ant-junit.spec
View File

@ -64,6 +64,7 @@ BuildRequires: junit
%endif
%if %{with antlr}
BuildRequires: xerces-j2
BuildRequires: xz-java
%endif
%if %{with junit5}
BuildRequires: apiguardian
@ -88,8 +89,6 @@ Provides: ant-trax = %{version}
%if %{with antlr}
Requires: antlr
%requires_eq ant
Provides: ant-antlr = %{version}-%{release}
Provides: ant-xz = %{version}-%{release}
Obsoletes: ant-javadoc
%endif
%if %{with junit}
@ -330,6 +329,18 @@ Apache Ant is a Java-based build tool.
This package contains optional jsch tasks for Apache Ant.
%package -n ant-xz
Summary: Opional xz tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: xz-java
%requires_eq ant
%description -n ant-xz
Apache Ant is a Java-based build tool.
This package contains optional xz tasks for Apache Ant.
%package -n ant-testutil
Summary: Test utility classes for ant
License: Apache-2.0
@ -388,7 +399,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
%endif
# Fix file-not-utf8 rpmlint warning
@ -504,7 +515,7 @@ do
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
else
%if %{with junit} || %{with junit5}
@ -576,6 +587,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
@ -633,7 +645,6 @@ popd
%if %{with antlr}
%files -f .mfiles
%{ant_home}/lib/ant-antlr.jar
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%endif
@ -724,6 +735,10 @@ popd
%{ant_home}/lib/ant-jsch.jar
%config(noreplace) %{_sysconfdir}/ant.d/jsch
%files -n ant-xz -f .mfiles-ant-xz
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/xz
%files -n ant-testutil -f .mfiles-ant-testutil
%{ant_home}/lib/ant-testutil.jar
%config(noreplace) %{_sysconfdir}/ant.d/testutil

2
ant-junit5.changes
View File

@ -8,6 +8,8 @@ Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
* apache-ant-xml-apis.patch
* reproducible-build-manifest.patch
+ rediff
- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
package
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>

25
ant-junit5.spec
View File

@ -64,6 +64,7 @@ BuildRequires: junit
%endif
%if %{with antlr}
BuildRequires: xerces-j2
BuildRequires: xz-java
%endif
%if %{with junit5}
BuildRequires: apiguardian
@ -88,8 +89,6 @@ Provides: ant-trax = %{version}
%if %{with antlr}
Requires: antlr
%requires_eq ant
Provides: ant-antlr = %{version}-%{release}
Provides: ant-xz = %{version}-%{release}
Obsoletes: ant-javadoc
%endif
%if %{with junit}
@ -330,6 +329,18 @@ Apache Ant is a Java-based build tool.
This package contains optional jsch tasks for Apache Ant.
%package -n ant-xz
Summary: Opional xz tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: xz-java
%requires_eq ant
%description -n ant-xz
Apache Ant is a Java-based build tool.
This package contains optional xz tasks for Apache Ant.
%package -n ant-testutil
Summary: Test utility classes for ant
License: Apache-2.0
@ -388,7 +399,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
%endif
# Fix file-not-utf8 rpmlint warning
@ -504,7 +515,7 @@ do
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
else
%if %{with junit} || %{with junit5}
@ -576,6 +587,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
@ -633,7 +645,6 @@ popd
%if %{with antlr}
%files -f .mfiles
%{ant_home}/lib/ant-antlr.jar
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%endif
@ -724,6 +735,10 @@ popd
%{ant_home}/lib/ant-jsch.jar
%config(noreplace) %{_sysconfdir}/ant.d/jsch
%files -n ant-xz -f .mfiles-ant-xz
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/xz
%files -n ant-testutil -f .mfiles-ant-testutil
%{ant_home}/lib/ant-testutil.jar
%config(noreplace) %{_sysconfdir}/ant.d/testutil

2
ant.changes
View File

@ -8,6 +8,8 @@ Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
* apache-ant-xml-apis.patch
* reproducible-build-manifest.patch
+ rediff
- Fix ant-xz.jar to be non-empty and split it from the ant-antlr
package
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>

25
ant.spec
View File

@ -63,6 +63,7 @@ BuildRequires: junit
%endif
%if %{with antlr}
BuildRequires: xerces-j2
BuildRequires: xz-java
%endif
%if %{with junit5}
BuildRequires: apiguardian
@ -87,8 +88,6 @@ Provides: ant-trax = %{version}
%if %{with antlr}
Requires: antlr
%requires_eq ant
Provides: ant-antlr = %{version}-%{release}
Provides: ant-xz = %{version}-%{release}
Obsoletes: ant-javadoc
%endif
%if %{with junit}
@ -329,6 +328,18 @@ Apache Ant is a Java-based build tool.
This package contains optional jsch tasks for Apache Ant.
%package -n ant-xz
Summary: Opional xz tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: xz-java
%requires_eq ant
%description -n ant-xz
Apache Ant is a Java-based build tool.
This package contains optional xz tasks for Apache Ant.
%package -n ant-testutil
Summary: Test utility classes for ant
License: Apache-2.0
@ -387,7 +398,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif
%if %{with antlr}
# we need to build junit in antlr, but we remove it later
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver
build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver xz-java
%endif
# Fix file-not-utf8 rpmlint warning
@ -503,7 +514,7 @@ do
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-xz -o "$jarname" = ant-bootstrap ]; then
elif [ "$jarname" = ant-antlr -o "$jarname" = ant-bootstrap ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
else
%if %{with junit} || %{with junit5}
@ -575,6 +586,7 @@ echo "ant/ant-imageio" > %{buildroot}%{_sysconfdir}/ant.d/imageio
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
echo "xz-java ant/ant-xz" > %{buildroot}%{_sysconfdir}/ant.d/xz
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
@ -632,7 +644,6 @@ popd
%if %{with antlr}
%files -f .mfiles
%{ant_home}/lib/ant-antlr.jar
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/antlr
%endif
@ -723,6 +734,10 @@ popd
%{ant_home}/lib/ant-jsch.jar
%config(noreplace) %{_sysconfdir}/ant.d/jsch
%files -n ant-xz -f .mfiles-ant-xz
%{ant_home}/lib/ant-xz.jar
%config(noreplace) %{_sysconfdir}/ant.d/xz
%files -n ant-testutil -f .mfiles-ant-testutil
%{ant_home}/lib/ant-testutil.jar
%config(noreplace) %{_sysconfdir}/ant.d/testutil