Simplify provides/req/obsoletes.
Drop a pile of old provider/requires/obsoletes that are no longer usable and cause only problem if ant is scl-ized.
This commit is contained in:
Alexander Kurtakov
parent
f0e14bcbb5
commit
cdbf67ef70
42
ant.spec
42
ant.spec
@ -49,7 +49,7 @@
|
||||
|
||||
Name: ant
|
||||
Version: 1.9.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Build tool for java
|
||||
Summary(it): Tool per la compilazione di programmi java
|
||||
@ -81,15 +81,6 @@ Requires: xerces-j2
|
||||
%endif
|
||||
|
||||
BuildArch: noarch
|
||||
# Allow subpackages not in RHEL to be installed from JPackage
|
||||
Provides: %{name} = %{epoch}:%{version}-%{release}
|
||||
#Drop in F-18
|
||||
Obsoletes: %{name}-nodeps < %{epoch}:%{version}-%{release}
|
||||
Provides: %{name}-nodeps = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: %{name}-trax < %{epoch}:%{version}-%{release}
|
||||
Provides: %{name}-trax = %{epoch}:%{version}-%{release}
|
||||
|
||||
|
||||
|
||||
%description
|
||||
Ant is a platform-independent build tool for java. It's used by apache
|
||||
@ -109,8 +100,6 @@ apache xml.
|
||||
Summary: Optional jmf tasks for %{name}
|
||||
Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-nodeps = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jmf = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description jmf
|
||||
Optional jmf tasks for %{name}.
|
||||
@ -122,7 +111,6 @@ Taches jmf optionelles pour %{name}.
|
||||
Summary: Optional swing tasks for %{name}
|
||||
Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-swing = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description swing
|
||||
Optional swing tasks for %{name}.
|
||||
@ -155,7 +143,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: antlr
|
||||
BuildRequires: antlr
|
||||
Provides: ant-antlr = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description antlr
|
||||
Optional antlr tasks for %{name}.
|
||||
@ -169,7 +156,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: bsf
|
||||
BuildRequires: bsf
|
||||
Provides: ant-apache-bsf = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-bsf
|
||||
Optional apache bsf tasks for %{name}.
|
||||
@ -183,7 +169,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: xml-commons-resolver
|
||||
BuildRequires: xml-commons-resolver
|
||||
Provides: ant-apache-resolver = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-resolver
|
||||
Optional apache resolver tasks for %{name}.
|
||||
@ -197,7 +182,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: apache-commons-logging
|
||||
BuildRequires: apache-commons-logging
|
||||
Provides: ant-commons-logging = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description commons-logging
|
||||
Optional commons logging tasks for %{name}.
|
||||
@ -211,7 +195,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: apache-commons-net
|
||||
BuildRequires: apache-commons-net
|
||||
Provides: ant-commons-net = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description commons-net
|
||||
Optional commons net tasks for %{name}.
|
||||
@ -227,7 +210,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: jai
|
||||
BuildRequires: jai
|
||||
Provides: ant-jai = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description jai
|
||||
Optional jai tasks for %{name}.
|
||||
@ -242,9 +224,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: bcel
|
||||
BuildRequires: bcel
|
||||
Provides: ant-apache-bcel = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-bcel = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-bcel < %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-bcel
|
||||
Optional apache bcel tasks for %{name}.
|
||||
@ -258,9 +237,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: log4j
|
||||
BuildRequires: log4j
|
||||
Provides: ant-apache-log4j = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-log4j = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-log4j < %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-log4j
|
||||
Optional apache log4j tasks for %{name}.
|
||||
@ -274,9 +250,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: jakarta-oro
|
||||
BuildRequires: jakarta-oro
|
||||
Provides: ant-apache-oro = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-oro = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-oro < %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-oro
|
||||
Optional apache oro tasks for %{name}.
|
||||
@ -290,9 +263,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: regexp
|
||||
BuildRequires: regexp
|
||||
Provides: ant-apache-regexp = %{epoch}:%{version}-%{release}
|
||||
Provides: ant-jakarta-regexp = %{epoch}:%{version}-%{release}
|
||||
Obsoletes: ant-jakarta-regexp < %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-regexp
|
||||
Optional apache regexp tasks for %{name}.
|
||||
@ -307,7 +277,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: regexp
|
||||
BuildRequires: regexp
|
||||
Requires: xalan-j2
|
||||
Provides: ant-apache-xalan2 = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description apache-xalan2
|
||||
Optional apache xalan2 tasks for %{name}.
|
||||
@ -321,7 +290,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: javamail >= 0:1.2-5jpp
|
||||
BuildRequires: javamail >= 0:1.2-5jpp
|
||||
Provides: ant-javamail = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description javamail
|
||||
Optional javamail tasks for %{name}.
|
||||
@ -335,7 +303,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: jdepend
|
||||
BuildRequires: jdepend
|
||||
Provides: ant-jdepend = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description jdepend
|
||||
Optional jdepend tasks for %{name}.
|
||||
@ -349,7 +316,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: jsch
|
||||
BuildRequires: jsch
|
||||
Provides: ant-jsch = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description jsch
|
||||
Optional jsch tasks for %{name}.
|
||||
@ -363,7 +329,6 @@ Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: junit
|
||||
Requires: xalan-j2
|
||||
Provides: ant-junit = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description junit
|
||||
Optional junit tasks for %{name}.
|
||||
@ -376,7 +341,6 @@ Summary: Test utility classes for %{name}
|
||||
Group: Development/Tools
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: junit
|
||||
Provides: ant-testutil = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description testutil
|
||||
Test utility tasks for %{name}.
|
||||
@ -741,6 +705,10 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Mon Apr 22 2013 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.0-2
|
||||
- Drop a pile of old provider/requires/obsoletes that are no longer usable
|
||||
and cause only problem if ant is scl-ized.
|
||||
|
||||
* Mon Mar 11 2013 Michal Srb <msrb@redhat.com> - 0:1.9.0-1
|
||||
- Update to upstream version 1.9.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user