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

Accepting request 98604 from openSUSE:Factory:ARM

Browse Source 
- use dist-lite and dist_javadocs to make javadoc build really
  optional
- fix arm check (ifarch does not work in a noarch spec file)

OBS-URL: https://build.opensuse.org/request/show/98604
OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=26
This commit is contained in:
Michal Vyskocil
2012-01-03 11:19:37 +00:00
committed by Git OBS Bridge
parent 954fffcb70
commit 5249742060
3 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
ant-antlr.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package ant-antlr
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -27,11 +27,9 @@
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
%global bootstrap 0
%if %with bootstrap
%global build_javadoc 0
%else
%if ! %with bootstrap
# disable javadoc build on arm platform - it delays a build a lot
%ifnarch %arm
%if %{_arch} != arm
%global build_javadoc 1
%endif
%endif
@@ -45,15 +43,11 @@
Name: ant-antlr
Version: 1.8.2
Release: 1
License: ASL 2.0
%if %bootstrap
Release: 0
Summary: Antlr Task for ant
%else
Summary: Antlr Task for ant
%endif
Url: http://ant.apache.org/
License: Apache-2.0
Group: Development/Tools/Building
Url: http://ant.apache.org/
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
Source2: apache-ant-%{major_version}.ant.conf
Source1000: pre_checkin.sh
@@ -141,8 +135,8 @@ based on the OS used.
%if %bootstrap
%package -n ant-jmf
License: Apache Software License ..
Summary: Optional jmf tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %{version}
Provides: ant-jmf = %{version}-%{release}
@@ -158,8 +152,8 @@ This package contains optional jmf tasks for Apache Ant.
%package -n ant-swing
License: Apache Software License ..
Summary: Optional swing tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %{version}
Provides: ant-swing = %{version}-%{release}
@@ -174,8 +168,8 @@ This package contains optional swing tasks for Apache Ant.
%package -n ant-scripts
License: Apache Software License ..
Summary: Additional scripts for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %{version}
Requires: %{_bindir}/perl
@@ -193,8 +187,8 @@ Ant.
%if ! %bootstrap
%package -n ant-apache-bsf
License: Apache Software License ..
Summary: Optional apache bsf tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: bsf
@@ -209,8 +203,8 @@ This package contains optional apache bsf tasks for Apache Ant.
%package -n ant-apache-resolver
License: Apache Software License ..
Summary: Optional apache resolver tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: xml-commons-resolver
@@ -225,8 +219,8 @@ This package contains optional apache resolver tasks for Apache Ant.
%package -n ant-commons-logging
License: Apache Software License ..
Summary: Optional commons logging tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jakarta-commons-logging
@@ -241,8 +235,8 @@ This package contains optional commons logging tasks for Apache Ant.
%package -n ant-commons-net
License: Apache Software License ..
Summary: Optional commons net tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jakarta-commons-net
@@ -262,6 +256,7 @@ This package contains optional commons net tasks for Apache Ant.
%package -n ant-jai
Summary: Optional jai tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jai
@@ -273,8 +268,8 @@ Optional jai tasks for ant.
%endif
%package -n ant-apache-bcel
License: Apache Software License ..
Summary: Optional apache bcel tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: bcel
@@ -291,8 +286,8 @@ This package contains optional apache bcel tasks for Apache Ant.
%package -n ant-apache-log4j
License: Apache Software License ..
Summary: Optional apache log4j tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: log4j
@@ -309,8 +304,8 @@ This package contains optional apache log4j tasks for Apache Ant.
%package -n ant-apache-oro
License: Apache Software License ..
Summary: Optional apache oro tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: oro
@@ -327,8 +322,8 @@ This package contains optional apache oro tasks for Apache Ant.
%package -n ant-apache-regexp
License: Apache Software License ..
Summary: Optional apache regexp tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: regexp
@@ -343,8 +338,8 @@ Apache Ant is a Java-based build tool.
This package contains optional apache regexp tasks for Apache Ant.
%package -n ant-apache-xalan2
License: Apache Software License ..
Summary: Optional apache xalan2 tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
BuildRequires: regexp
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
@@ -356,8 +351,8 @@ Optional apache xalan2 tasks for %{name}.
%package -n ant-javamail
License: Other uncritical OpenSource License ; Common Development and Distribution License
Summary: Optional javamail tasks for ant
License: Other uncritical OpenSource License ; Common Development and Distribution License
Group: Development/Tools/Building
BuildRequires: javamail >= 1.2-5jpp
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
@@ -372,8 +367,8 @@ This package contains optional javamail tasks for Apache Ant.
%package -n ant-jdepend
License: Apache Software License ..
Summary: Optional jdepend tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jdepend
@@ -388,8 +383,8 @@ This package contains optional jdepend tasks for Apache Ant.
%package -n ant-jsch
License: Apache Software License ..
Summary: Optional jsch tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jsch
@@ -404,8 +399,8 @@ This package contains optional jsch tasks for Apache Ant.
%package -n ant-junit
License: Apache Software License ..
Summary: Optional junit tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: junit
@@ -417,8 +412,8 @@ Apache Ant is a Java-based build tool.
This package contains optional JUnit tasks for Apache Ant.
%package -n ant-testutil
License: Apache Software License ..
Summary: Test utility classes for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: junit
@@ -430,8 +425,8 @@ Test utility tasks for %{name}.
%package -n ant-manual
License: Apache Software License ..
Summary: Manual for ant
License: Apache-2.0
Group: Development/Tools/Building
%description -n ant-manual
@@ -440,11 +435,11 @@ Apache Ant is a Java-based build tool.
This package contains the manual for Apache Ant.
%if %{build_javadoc}
%if 0%{?build_javadoc}
%package -n ant-javadoc
License: Apache Software License ..
Summary: Javadoc for ant
License: Apache-2.0
Group: Development/Tools/Building
%description -n ant-javadoc
@@ -514,10 +509,10 @@ export OPT_JAR_LIST=:
%if ! %bootstrap
export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} -Dbuild.sysclasspath=first dist
%{ant} -Dbuild.sysclasspath=first dist-lite
%if %{build_javadoc}
%{ant} javadocs
%if 0%{?build_javadoc}
%{ant} dist_javadocs
%endif
%else
@@ -630,14 +625,14 @@ echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
%if ! %bootstrap
%if %{build_javadoc}
%if 0%{?build_javadoc}
mkdir -p %{buildroot}%{_javadocdir}/ant
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant
%endif #javadoc
%endif
%if %{build_javadoc}
%if 0%{?build_javadoc}
# fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
%endif #javadoc
@@ -879,7 +874,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%defattr(0644,root,root,0755)
%doc docs/*
%if %{build_javadoc}
%if 0%{?build_javadoc}
%files -n ant-javadoc
%defattr(0644,root,root,0755)

7
ant.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jan 3 01:01:19 CET 2012 - dmueller@suse.de
- use dist-lite and dist_javadocs to make javadoc build really
optional
- fix arm check (ifarch does not work in a noarch spec file)
-------------------------------------------------------------------
Thu Dec 15 08:49:28 UTC 2011 - mvyskocil@suse.cz

71
ant.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package ant
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -26,11 +26,9 @@
%global bootstrap 1
%if %with bootstrap
%global build_javadoc 0
%else
%if ! %with bootstrap
# disable javadoc build on arm platform - it delays a build a lot
%ifnarch %arm
%if %{_arch} != arm
%global build_javadoc 1
%endif
%endif
@@ -44,15 +42,11 @@
Name: ant
Version: 1.8.2
Release: 1
License: ASL 2.0
%if %bootstrap
Release: 0
Summary: Antlr Task for ant
%else
Summary: Antlr Task for ant
%endif
Url: http://ant.apache.org/
License: Apache-2.0
Group: Development/Tools/Building
Url: http://ant.apache.org/
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2
Source2: apache-ant-%{major_version}.ant.conf
Source1000: pre_checkin.sh
@@ -140,8 +134,8 @@ based on the OS used.
%if %bootstrap
%package -n ant-jmf
License: Apache Software License ..
Summary: Optional jmf tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %{version}
Provides: ant-jmf = %{version}-%{release}
@@ -157,8 +151,8 @@ This package contains optional jmf tasks for Apache Ant.
%package -n ant-swing
License: Apache Software License ..
Summary: Optional swing tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %{version}
Provides: ant-swing = %{version}-%{release}
@@ -173,8 +167,8 @@ This package contains optional swing tasks for Apache Ant.
%package -n ant-scripts
License: Apache Software License ..
Summary: Additional scripts for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %{version}
Requires: %{_bindir}/perl
@@ -192,8 +186,8 @@ Ant.
%if ! %bootstrap
%package -n ant-apache-bsf
License: Apache Software License ..
Summary: Optional apache bsf tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: bsf
@@ -208,8 +202,8 @@ This package contains optional apache bsf tasks for Apache Ant.
%package -n ant-apache-resolver
License: Apache Software License ..
Summary: Optional apache resolver tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: xml-commons-resolver
@@ -224,8 +218,8 @@ This package contains optional apache resolver tasks for Apache Ant.
%package -n ant-commons-logging
License: Apache Software License ..
Summary: Optional commons logging tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jakarta-commons-logging
@@ -240,8 +234,8 @@ This package contains optional commons logging tasks for Apache Ant.
%package -n ant-commons-net
License: Apache Software License ..
Summary: Optional commons net tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jakarta-commons-net
@@ -261,6 +255,7 @@ This package contains optional commons net tasks for Apache Ant.
%package -n ant-jai
Summary: Optional jai tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jai
@@ -272,8 +267,8 @@ Optional jai tasks for ant.
%endif
%package -n ant-apache-bcel
License: Apache Software License ..
Summary: Optional apache bcel tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: bcel
@@ -290,8 +285,8 @@ This package contains optional apache bcel tasks for Apache Ant.
%package -n ant-apache-log4j
License: Apache Software License ..
Summary: Optional apache log4j tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: log4j
@@ -308,8 +303,8 @@ This package contains optional apache log4j tasks for Apache Ant.
%package -n ant-apache-oro
License: Apache Software License ..
Summary: Optional apache oro tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: oro
@@ -326,8 +321,8 @@ This package contains optional apache oro tasks for Apache Ant.
%package -n ant-apache-regexp
License: Apache Software License ..
Summary: Optional apache regexp tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: regexp
@@ -342,8 +337,8 @@ Apache Ant is a Java-based build tool.
This package contains optional apache regexp tasks for Apache Ant.
%package -n ant-apache-xalan2
License: Apache Software License ..
Summary: Optional apache xalan2 tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
BuildRequires: regexp
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
@@ -355,8 +350,8 @@ Optional apache xalan2 tasks for %{name}.
%package -n ant-javamail
License: Other uncritical OpenSource License ; Common Development and Distribution License
Summary: Optional javamail tasks for ant
License: Other uncritical OpenSource License ; Common Development and Distribution License
Group: Development/Tools/Building
BuildRequires: javamail >= 1.2-5jpp
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
@@ -371,8 +366,8 @@ This package contains optional javamail tasks for Apache Ant.
%package -n ant-jdepend
License: Apache Software License ..
Summary: Optional jdepend tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jdepend
@@ -387,8 +382,8 @@ This package contains optional jdepend tasks for Apache Ant.
%package -n ant-jsch
License: Apache Software License ..
Summary: Optional jsch tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: jsch
@@ -403,8 +398,8 @@ This package contains optional jsch tasks for Apache Ant.
%package -n ant-junit
License: Apache Software License ..
Summary: Optional junit tasks for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: junit
@@ -416,8 +411,8 @@ Apache Ant is a Java-based build tool.
This package contains optional JUnit tasks for Apache Ant.
%package -n ant-testutil
License: Apache Software License ..
Summary: Test utility classes for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`)
Requires: junit
@@ -429,8 +424,8 @@ Test utility tasks for %{name}.
%package -n ant-manual
License: Apache Software License ..
Summary: Manual for ant
License: Apache-2.0
Group: Development/Tools/Building
%description -n ant-manual
@@ -439,11 +434,11 @@ Apache Ant is a Java-based build tool.
This package contains the manual for Apache Ant.
%if %{build_javadoc}
%if 0%{?build_javadoc}
%package -n ant-javadoc
License: Apache Software License ..
Summary: Javadoc for ant
License: Apache-2.0
Group: Development/Tools/Building
%description -n ant-javadoc
@@ -513,10 +508,10 @@ export OPT_JAR_LIST=:
%if ! %bootstrap
export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
%{ant} -Dbuild.sysclasspath=first dist
%{ant} -Dbuild.sysclasspath=first dist-lite
%if %{build_javadoc}
%{ant} javadocs
%if 0%{?build_javadoc}
%{ant} dist_javadocs
%endif
%else
@@ -629,14 +624,14 @@ echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
%if ! %bootstrap
%if %{build_javadoc}
%if 0%{?build_javadoc}
mkdir -p %{buildroot}%{_javadocdir}/ant
cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/ant
%endif #javadoc
%endif
%if %{build_javadoc}
%if 0%{?build_javadoc}
# fix link between manual and javadoc
(cd docs/manual; ln -sf %{_javadocdir}/%{name} api)
%endif #javadoc
@@ -878,7 +873,7 @@ find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
%defattr(0644,root,root,0755)
%doc docs/*
%if %{build_javadoc}
%if 0%{?build_javadoc}
%files -n ant-javadoc
%defattr(0644,root,root,0755)