fix repotag

This commit is contained in:
Tom Callaway 2008-07-09 17:00:49 +00:00
parent 9a3a4126dd
commit 8d64b3a0fb

View File

@ -50,17 +50,16 @@
%define section free
%define major_version 1.7
%define jpprelease 1jpp
%define cvs_version 1.7.0
Name: ant
Version: 1.7.0
Release: %{jpprelease}.4%{?dist}
Release: 2%{?dist}
Epoch: 0
Summary: Ant build tool for java
Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
License: Apache Software License
License: ASL 2.0
URL: http://ant.apache.org/
Group: Development/Build Tools
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz
@ -96,17 +95,17 @@ BuildRequires: xml-commons-apis
BuildArch: noarch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: ant-optional < %{epoch}:%{version}-%{jpprelease}
Obsoletes: ant-optional-full < %{epoch}:%{version}-%{jpprelease}
Obsoletes: ant-optional < %{epoch}:%{version}-%{release}
Obsoletes: ant-optional-full < %{epoch}:%{version}-%{release}
# Allow subpackages not in Fedora to be installed from JPackage
Provides: %{name} = %{epoch}:%{version}-%{jpprelease}
Provides: %{name} = %{epoch}:%{version}-%{release}
# RHEL3 and FC2
Obsoletes: %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
Provides: %{name}-libs = %{epoch}:%{version}-%{jpprelease}
Provides: %{name}-core = %{epoch}:%{version}-%{jpprelease}
Provides: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: %{name}-core = %{epoch}:%{version}-%{release}
# FC4
Obsoletes: %{name}-jmf <= 1.6.2-3jpp_12fc
Provides: %{name}-jmf = %{epoch}:%{version}-%{jpprelease}
Provides: %{name}-jmf = %{epoch}:%{version}-%{release}
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@ -1369,6 +1368,10 @@ fi
# -----------------------------------------------------------------------------
%changelog
* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.7.0-2
- drop repotag
- fix license tag
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0:1.7.0-1jpp.4
- Autorebuild for GCC 4.3